Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
phpmyadmin · Dec 12, 2014 · 780ff02 · 780ff02
2 parents beb4f14 + eb69c01
commit 780ff02
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog
 - bug #4638 Default Export Method setting broken
 - bug #4639 Export SQL missing indentation first field
 - bug #4637 Field Alignment
+- bug #4644 Error when browsing tables
 
 4.3.1.0 (2014-12-08)
 - bug #4609 'Show all' checkbox label is not clickable

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -1820,11 +1820,13 @@ public static function linkOrButton(
             if ($suhosin_get_MaxValueLength) {
                 $query_parts = self::splitURLQuery($url);
                 foreach ($query_parts as $query_pair) {
-                    list(, $eachval) = explode('=', $query_pair);
-                    if (/*overload*/mb_strlen($eachval) > $suhosin_get_MaxValueLength
-                    ) {
-                        $in_suhosin_limits = false;
-                        break;
+                    if (strpos($query_pair, '=') !== false) {
+                        list(, $eachval) = explode('=', $query_pair);
+                        if (/*overload*/mb_strlen($eachval) > $suhosin_get_MaxValueLength
+                        ) {
+                            $in_suhosin_limits = false;
+                            break;
+                        }
                     }
                 }
             }