Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 3, 2012 · ba9b500 · ba9b500
2 parents 35ee73a + e6afd60
commit ba9b500
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -3397,7 +3397,7 @@ public static function expandUserString(
             $column_names = array();
             foreach ($columns_list as $column) {
                 if (! is_null($escape)) {
-                    $column_names[] = $escape($column['Field']);
+                    $column_names[] = self::$escape($column['Field']);
                 } else {
                     $column_names[] = $column['Field'];
                 }