Merge code github > bitbucket 2014-05-23 16:35

2014-05-23 16:32:18 -04:00
parent 450d0ab6d1 6ae5fa6d36
commit 33fb82f376
75 changed files with 2274 additions and 724 deletions
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -1763,7 +1763,7 @@ class G
                                if ($nl2brRecursive) {
                                    foreach ($aRow as $sKey => $vValue) {
                                        if (!is_array($vValue)) {
-                                            $aRow[$sKey] = nl2br($aRow[$sKey]);
+                                            $aRow[$sKey] = str_replace($nrt, $nrthtml, nl2br($aRow[$sKey]));
                                        }
                                    }
                                }
@@ -5231,6 +5231,7 @@ class G
        if (!isset($allFunctions['user'])) {
            $allFunctions['user'] = array();
        }
+        $allFunctions['user'][] = 'sort';
        return in_array(strtolower($functionName), $allFunctions['user']);
    }