Merge remote-tracking branch 'origin/master'

2012-10-03 12:08:35 +02:00 · 2012-10-03 12:08:35 +02:00 · ba9b500fe9
commit ba9b500fe9
parent 35ee73adc8 e6afd60299
1 changed files with 1 additions and 1 deletions
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@ -3397,7 +3397,7 @@ class PMA_Util
            $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'];
                }