Merge commit 'ada003a'

This commit is contained in:
Marc Delisle 2015-09-15 15:54:08 -04:00
commit fc0cba2aa5

View File

@ -26,7 +26,7 @@ class PMA_Linter
*/
public static function getLines($str)
{
if ((!($str instanceof UtfString))
if ((!($str instanceof SqlParser\UtfString))
&& (defined('USE_UTF_STRINGS')) && (USE_UTF_STRINGS)
) {
// If the lexer uses UtfString for processing then the position will