diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2013-05-26 20:13:33 +0400 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2013-05-26 20:13:33 +0400 |
| commit | 2baf473ad70b1358fca776ed05c3efbc7e99696e (patch) | |
| tree | d34a0026b3ffa1fe2ecf554a30bcb2b1efe0691c /server_status.php | |
| parent | 0dab7f2463ada776ce9b1a8671fa30573777809c (diff) | |
| parent | b8e4f346a5c0b029cc25887c990a190d22c0f18c (diff) | |
Merge branch 'master' into OOP_DBI
Conflicts:
libraries/database_interface.lib.php
Diffstat (limited to 'server_status.php')
| -rw-r--r-- | server_status.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server_status.php b/server_status.php index 6e81e70f06..8780b0aa0c 100644 --- a/server_status.php +++ b/server_status.php @@ -532,7 +532,7 @@ function PMA_getTableProcesslistHtml($ServerStatusData) if (! $show_full_sql && strlen($process['Info']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) { $retval .= htmlspecialchars(substr($process['Info'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]'; } else { - $retval .= PMA_SQP_formatHtml(PMA_SQP_parse($process['Info'])); + $retval .= PMA_SQP_format(PMA_SQP_parse($process['Info'])); } } $retval .= '</td>'; |