The branch, master has been updated
via d50215684a9b5b0cab7d8404f489a721f92d93f4 (commit)
from 5b900ead54f457e75398ba22910b58663e922aac (commit)
- Log -----------------------------------------------------------------
commit d50215684a9b5b0cab7d8404f489a721f92d93f4
Author: Michal Čihař <mcihar(a)novell.com>
Date: Fri Jan 28 09:28:37 2011 +0100
[interface] Add link to documentation for status variables.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
server_status.php | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3a7d64f..45e274b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -130,6 +130,7 @@
- bug #3141327 [relation] Foreign key input options
- [export] Better handling of export to PHP array.
- rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user
+- [interface] Add link to documentation for status variables.
3.3.10.0 (not yet released)
- patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/server_status.php b/server_status.php
index bd5dafc..a797446 100644
--- a/server_status.php
+++ b/server_status.php
@@ -41,7 +41,7 @@ require_once './libraries/replication_gui.lib.php';
require_once './libraries/chart.lib.php';
/**
- * Messages are built using the message name
+ * Messages are built using the message name
*/
$strShowStatusBinlog_cache_disk_useDescr = __('The number of transactions that used the temporary binary log cache but that exceeded the value of binlog_cache_size and used a temporary file to store statements from the transaction.');
$strShowStatusBinlog_cache_useDescr = __('The number of transactions that used the temporary binary log cache.');
@@ -789,7 +789,8 @@ if (! empty($section['title'])) {
$odd_row = !$odd_row;
?>
<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
- <th class="name"><?php echo htmlspecialchars($name); ?></th>
+ <th class="name"><?php echo htmlspecialchars($name) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
+ </th>
<td class="value"><?php
if (isset($alerts[$name])) {
if ($value > $alerts[$name]) {
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via f57daa0a59a0058a4b3be1bbdf1577b59d7d697a (commit)
from acf2e0a0340bfca162120c08b29f85e763cf08a5 (commit)
- Log -----------------------------------------------------------------
commit f57daa0a59a0058a4b3be1bbdf1577b59d7d697a
Author: Herman van Rink <rink(a)initfour.nl>
Date: Wed Jan 26 11:36:10 2011 +0100
Fix XSS problem, regression in the 3.4 branch.
Dev releases until -beta2 are vulnerable.
Thanks to Aung Khant from YGN Ethical Hacker Group (http://yehg.net/) for reporting this issue.
-----------------------------------------------------------------------
Summary of changes:
libraries/header.inc.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 6ce37b8..dee9b15 100644
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -121,7 +121,7 @@ if (!$GLOBALS['is_ajax_request']) {
printf($item,
$GLOBALS['cfg']['DefaultTabDatabase'],
PMA_generate_common_url($GLOBALS['db']),
- $GLOBALS['db'],
+ htmlspecialchars($GLOBALS['db']),
__('Database'),
's_tbl.png');
// if the table is being dropped, $_REQUEST['purge'] is set
hooks/post-receive
--
phpMyAdmin