The branch, master has been updated
via 3a373b4a14f9fbb3f8f7dbec3b0166efe17cac1f (commit)
from 19172fb476a0082cb5e1e560c3613a99a4f085aa (commit)
- Log -----------------------------------------------------------------
commit 3a373b4a14f9fbb3f8f7dbec3b0166efe17cac1f
Author: Piotr Przybylski <[email protected]>
Date: Tue Aug 2 01:27:52 2011 +0200
Respect MaxCharactersInDisplayedSQL in process list on Server Status page
-----------------------------------------------------------------------
Summary of changes:
server_status.php | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server_status.php b/server_status.php
index 7e4babd..e5bb06f 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1055,7 +1055,19 @@ function printServerTraffic() {
<td><?php echo $process['Command']; ?></td>
<td class="value"><?php echo $process['Time']; ?></td>
<td><?php echo (empty($process['State']) ? '---' : $process['State']);
?></td>
- <td><?php echo (empty($process['Info']) ? '---' :
PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']))); ?></td>
+ <td>
+ <?php
+ if (empty($process['Info'])) {
+ echo '---';
+ } else {
+ if (empty($_REQUEST['full']) && strlen($process['Info']) >
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+ echo htmlspecialchars(substr($process['Info'], 0,
$GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
+ } else {
+ echo PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']));
+ }
+ }
+ ?>
+ </td>
</tr>
<?php
$odd_row = ! $odd_row;
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
