[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_2-2086-gba0ca18 - Git

26 Apr 2010

The branch, master has been updated
       via  ba0ca1851a2605c17f23bd850b5c1575a11f83bb (commit)
       via  06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit)
       via  bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit)
      from  5cb5afedbb580fd5e13c018a63e71be076e5ca16 (commit)
- Log -----------------------------------------------------------------
commit ba0ca1851a2605c17f23bd850b5c1575a11f83bb
Merge: 5cb5afedbb580fd5e13c018a63e71be076e5ca16 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b
Author: Marc Delisle marc@infomarc.info
Date:   Mon Apr 26 16:38:46 2010 -0400
Merge branch 'QA_3_3'
-----------------------------------------------------------------------
Summary of changes:
 ChangeLog        |    1 +
 tbl_tracking.php |   14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c5fbcc6..c0866d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -100,6 +100,7 @@ $Id$
 - bug #2974067 [display] non-binary fields shown as hex
 - bug #2983065 [operations] Error when changing from Maria to MyISAM engine
 - bug #2975408 [tracking] Data too long for column data_sql
+- bug [tracking] Tracking report should obey MaxCharactersInDisplayedSQL
3.3.2.0 (2010-04-13)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/tbl_tracking.php b/tbl_tracking.php
index f43bbcf..534d6d4 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -416,8 +416,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
         <?php
         $style = 'odd';
         foreach ($data['ddlog'] as $entry) {
-            $parsed_sql = PMA_SQP_parse($entry['statement']);
-            $statement  = PMA_formatSql($parsed_sql);
+            if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+                $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
+            } else {
+                $statement  = PMA_formatSql(PMA_SQP_parse($entry['statement']));
+            }
             $timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to && 
@@ -464,8 +467,11 @@ if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
         <?php
         $style = 'odd';
         foreach ($data['dmlog'] as $entry) {
-            $parsed_sql = PMA_SQP_parse($entry['statement']);
-            $statement  = PMA_formatSql($parsed_sql);
+            if (strlen($entry['statement']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+                $statement = substr($entry['statement'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) . '[...]';
+            } else {
+                $statement  = PMA_formatSql(PMA_SQP_parse($entry['statement']));
+            }
             $timestamp = strtotime($entry['date']);
if ($timestamp >= $filter_ts_from && $timestamp <= $filter_ts_to &&
hooks/post-receive
-- 
phpMyAdmin


    