Merge branch 'QA_4_6'

phpmyadmin · Aug 30, 2016 · 89fc40a · 89fc40a
2 parents 5c89725 + f3babbb
commit 89fc40a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/Linter.php b/libraries/Linter.php
@@ -51,7 +51,7 @@ public static function getLines($str)
         // (which is actually a new line) aren't going to be processed at
         // all.
         $len = ($str instanceof UtfString) ?
-            $str->length() : strlen($len);
+            $str->length() : strlen($str);
 
         $lines = array(0);
         for ($i = 0; $i < $len; ++$i) {