Sfoglia il codice sorgente

Minor fix in the Database::select function due the recent parse_conditions "order" changes

Julio Montoya 13 anni fa
parent
commit
ff6657041b
2 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. 2 2
      main/inc/lib/database.lib.php
  2. 1 1
      main/inc/lib/database.mysqli.lib.php

+ 2 - 2
main/inc/lib/database.lib.php

@@ -1241,8 +1241,8 @@ class Database {
                     $order_array = $condition_data;                
                     
                     if (!empty($order_array)) {                           
-                        if (count($order_array) >= 1 && !empty($order_array[0])) {                            
-                            $order_array = self::escape_string($order_array[0]);
+                        if (is_array($order_array) && count($order_array) >= 1 && !empty($order_array[0])) {                            							
+                            $order_array = self::escape_string($order_array[0]);							
                             
                             $new_order_array = explode(',', $order_array);
                             

+ 1 - 1
main/inc/lib/database.mysqli.lib.php

@@ -1159,7 +1159,7 @@ class Database {
                     $order_array = $condition_data;                
                     
                     if (!empty($order_array)) {                           
-                        if (count($order_array) >= 1 && !empty($order_array[0])) {                            
+                        if (is_array($order_array) && count($order_array) >= 1 && !empty($order_array[0])) {                            
                             $order_array = self::escape_string($order_array[0]);
                             
                             $new_order_array = explode(',', $order_array);