Use new truncating code

phpmyadmin · Aug 6, 2013 · 2711010 · 2711010
1 parent 32b33a9
commit 2711010
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 29 deletions.
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
@@ -640,17 +640,7 @@ public static function mysqlDie(
         } elseif (empty($the_query) || (trim($the_query) == '')) {
             $formatted_sql = '';
         } else {
-            if (strlen($the_query) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-                $formatted_sql = htmlspecialchars(
-                    substr(
-                        $the_query, 0,
-                        $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
-                    )
-                )
-                . '[...]';
-            } else {
-                $formatted_sql = self::formatSql($the_query);
-            }
+            $formatted_sql = self::formatSql($the_query, true);
         }
         // ---
         $error_msg .= "\n" . '<!-- PMA-SQL-ERROR -->' . "\n";

diff --git a/tbl_tracking.php b/tbl_tracking.php
@@ -561,15 +561,7 @@ function PMA_filterTracking(
 
         $style = 'odd';
         foreach ($data['ddlog'] as $entry) {
-            if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-                $statement = substr(
-                    $entry['statement'],
-                    0,
-                    $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
-                ) . '[...]';
-            } else {
-                $statement  = PMA_Util::formatSql($entry['statement']);
-            }
+            $statement  = PMA_Util::formatSql($entry['statement'], true);
             $timestamp = strtotime($entry['date']);
 
             if ($timestamp >= $filter_ts_from
@@ -628,15 +620,7 @@ function PMA_filterTracking(
 
         $style = 'odd';
         foreach ($data['dmlog'] as $entry) {
-            if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
-                $statement = substr(
-                    $entry['statement'],
-                    0,
-                    $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']
-                ) . '[...]';
-            } else {
-                $statement  = PMA_Util::formatSql($entry['statement']);
-            }
+            $statement  = PMA_Util::formatSql($entry['statement'], true);
             $timestamp = strtotime($entry['date']);
 
             if ($timestamp >= $filter_ts_from