소스 검색

Remove non deterministic "group by" see #8029

Julio Montoya 9 년 전
부모
커밋
0755fb60f4
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 1 1
      main/admin/settings.lib.php
  2. 1 1
      main/inc/lib/api.lib.php

+ 1 - 1
main/admin/settings.lib.php

@@ -1456,7 +1456,7 @@ function search_setting($search)
     }
     }
     $table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $table_settings_current = Database :: get_main_table(TABLE_MAIN_SETTINGS_CURRENT);
     $sql = "SELECT * FROM $table_settings_current
     $sql = "SELECT * FROM $table_settings_current
-            WHERE category <> 'Plugins' GROUP BY variable ORDER BY id ASC ";
+            WHERE category <> 'Plugins' ORDER BY id ASC ";
     $result = Database::store_result(Database::query($sql), 'ASSOC');
     $result = Database::store_result(Database::query($sql), 'ASSOC');
     $settings = array();
     $settings = array();
 
 

+ 1 - 1
main/inc/lib/api.lib.php

@@ -5361,7 +5361,7 @@ function & api_get_settings($cat = null, $ordering = 'list', $access_url = 1, $u
         $sql .= " AND category='$cat' ";
         $sql .= " AND category='$cat' ";
     }
     }
     if ($ordering == 'group') {
     if ($ordering == 'group') {
-        $sql .= " GROUP BY variable ORDER BY id ASC";
+        $sql .= " ORDER BY id ASC";
     } else {
     } else {
         $sql .= " ORDER BY 1,2 ASC";
         $sql .= " ORDER BY 1,2 ASC";
     }
     }