[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_2-26-g06c8fa0
Marc Delisle
lem9 at users.sourceforge.net
Mon Apr 26 22:38:29 CEST 2010
The branch, QA_3_3 has been updated
via 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b (commit)
from bd4e0b83d8f13060e8422c86dca1e4fa2babc7c4 (commit)
- Log -----------------------------------------------------------------
commit 06c8fa0abbe2ff3a9c05f8514e229f1a64eb514b
Author: Marc Delisle <marc at infomarc.info>
Date: Mon Apr 26 16:38:20 2010 -0400
Tracking report should obey MaxCharactersInDisplayedSQL
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_tracking.php | 14 ++++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f39c01f..46a7f1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- 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 fbee82a..224ed87 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -417,8 +417,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 &&
@@ -465,8 +468,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
More information about the Git
mailing list