diff options
author | Michal Čihař <mcihar@suse.cz> | 2012-03-14 20:18:17 +0400 |
---|---|---|
committer | Michal Čihař <mcihar@suse.cz> | 2012-03-14 20:18:17 +0400 |
commit | 5078a87eaec1224e0c4a708ccf9de963e27ddb7b (patch) | |
tree | 7b05d3e133fb85f37b9d37636487ff75f97ebd7f /tbl_tracking.php | |
parent | 4ef49f3a4b7cd8c4ece4154d9446d66111794e79 (diff) | |
parent | c783a31c5cd70e1da7608f5f0e6b130b18a79089 (diff) |
Merge remote-tracking branch 'origin/QA_3_5'
Conflicts:
tbl_tracking.php
Diffstat (limited to 'tbl_tracking.php')
-rw-r--r-- | tbl_tracking.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tbl_tracking.php b/tbl_tracking.php index ba093b6d0a..45fc823a41 100644 --- a/tbl_tracking.php +++ b/tbl_tracking.php @@ -170,7 +170,7 @@ if (isset($_REQUEST['submit_create_version'])) { $tracking_set = rtrim($tracking_set, ','); if (PMA_Tracker::createVersion($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'], $tracking_set )) { - $msg = PMA_Message::success(sprintf(__('Version %1$s was created, tracking for %2$s is active.'), $_REQUEST['version'], htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']))); + $msg = PMA_Message::success(sprintf(__('Version %1$s was created, tracking for %2$s is active.'), htmlspecialchars($_REQUEST['version']), htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']))); $msg->display(); } } @@ -178,7 +178,7 @@ if (isset($_REQUEST['submit_create_version'])) { // Deactivate tracking if (isset($_REQUEST['submit_deactivate_now'])) { if (PMA_Tracker::deactivateTracking($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'])) { - $msg = PMA_Message::success(sprintf(__('Tracking for %1$s was deactivated at version %2$s.'), htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']), $_REQUEST['version'])); + $msg = PMA_Message::success(sprintf(__('Tracking for %1$s was deactivated at version %2$s.'), htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']), htmlspecialchars($_REQUEST['version']))); $msg->display(); } } @@ -186,7 +186,7 @@ if (isset($_REQUEST['submit_deactivate_now'])) { // Activate tracking if (isset($_REQUEST['submit_activate_now'])) { if (PMA_Tracker::activateTracking($GLOBALS['db'], $GLOBALS['table'], $_REQUEST['version'])) { - $msg = PMA_Message::success(sprintf(__('Tracking for %1$s was activated at version %2$s.'), htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']), $_REQUEST['version'])); + $msg = PMA_Message::success(sprintf(__('Tracking for %1$s was activated at version %2$s.'), htmlspecialchars($GLOBALS['db'] . '.' . $GLOBALS['table']), htmlspecialchars($_REQUEST['version']))); $msg->display(); } } @@ -243,7 +243,7 @@ if (isset($_REQUEST['snapshot'])) { $drop_create_statements .= $data['ddlog'][1]['statement']; } // Print SQL code - PMA_showMessage(sprintf(__('Version %s snapshot (SQL code)'), $_REQUEST['version']), $drop_create_statements); + PMA_showMessage(sprintf(__('Version %s snapshot (SQL code)'), htmlspecialchars($_REQUEST['version'])), $drop_create_statements); // Unserialize snapshot $temp = unserialize($data['schema_snapshot']); |