Merge branch 'master' into master

Author: easterism

inc/classes/Tool.php

@@ -423,7 +423,7 @@ public static function printJs($src, $chachable = false) {
             //помещаем скрипт в head
             echo "<script type=\"text/javascript\">jsToHead('$src')</script>";
         } else {
-            echo '<script type="text/javascript" language="JavaScript" src="' . $src . '"></script>';
+            echo '<script type="text/javascript" src="' . $src . '"></script>';
         }
     }
 
@@ -437,14 +437,14 @@ public static function printJs($src, $chachable = false) {
      *
      * @return array
      */
-    public static function arrayMultisort($array, $on, $order = SORT_ASC) {
+    public static function arrayMultisort($array, $key, $order = SORT_ASC) {
 
         switch ($order) {
             case SORT_ASC:
-                usort($array, create_function('$a, $b', "return strnatcasecmp(\$a['$on'], \$b['$on']);"));
+                usort($array, function($a, $b) use ($key) {return strnatcasecmp($a[$key], $b[$key]);});
                 break;
             case SORT_DESC:
-                usort($array, create_function('$a, $b', "return strnatcasecmp(\$b['$on'], \$a['$on']);"));
+                usort($array, function($a, $b) use ($key) {return strnatcasecmp($b[$key], $a[$key]);});
                 break;
         }
 
@@ -700,4 +700,5 @@ public static function getInTranslit($string)
         );
         return $str = iconv("UTF-8", "UTF-8//IGNORE", strtr($string, $replace));
     }
+
 }

inc/classes/class.list.php

@@ -103,12 +103,12 @@ public function setRecordCount($value) {
     /**
      * @param $name
      * @param string $width
-     * @param $type
+     * @param string $type
      * @param string $in
      * @param string $processing
      * @param bool $sort
      */
-    public function addColumn($name, $width = "0%", $type = 'TEXT', $in = "", $processing = "", $sort = true) {
+    public function addColumn($name, $width = "0%", $type = "TEXT", $in = "", $processing = "", $sort = true) {
         if (!array_key_exists($this->main_table_id, $this->table_column)) {
             $this->table_column[$this->main_table_id] = array();
         }
@@ -541,7 +541,7 @@ public function getData() {
                 };
             }
         }
-        if (!$this->extOrder && !$this->customSearchHasVal) {
+        if (isset($this->table_column[$this->main_table_id]) && !$this->extOrder && !$this->customSearchHasVal) {
             if ($order) {
                 $orderField = $order + 1;
                 $tempSQL    = $this->SQL;

mod/cron/v3.0.2

@@ -0,0 +1 @@
+Subproject commit 6b9675e94add0ba82f914ea93a09771922e2b44b

mod/profile/v2.0.0

@@ -0,0 +1 @@
+Subproject commit 69a015c02875ae8611c20f3d44198b0417ef6987

mod/webservice/v2.2.0

@@ -0,0 +1 @@
+Subproject commit 983c6a8635455feefabff2c976b0a505bd79d81a