Merge remote-tracking branch 'origin/master'

phpmyadmin · Mar 5, 2015 · f13aaa6 · f13aaa6
2 parents 3650df2 + 72abbab
commit f13aaa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -70,6 +70,7 @@ explanation
 4.3.12.0 (not yet released)
 - bug #4746 Right-aligned columns have left-aligned header
 - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values
+- bug       Undefined index savedsearcheswork 
 
 4.3.11.1 (2015-03-04)
 - bug       [security] Risk of BREACH attack, see PMASA-2015-1

diff --git a/db_qbe.php b/db_qbe.php
@@ -22,7 +22,7 @@
 $savedSearchList = array();
 $savedSearch = null;
 $currentSearchId = null;
-if ($cfgRelation['savedsearcheswork']) {
+if (isset($cfgRelation['savedsearcheswork']) && $cfgRelation['savedsearcheswork']) {
     include 'libraries/SavedSearches.class.php';
     $header = $response->getHeader();
     $scripts = $header->getScripts();