gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not advertise on every table level page that tracking is active

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2014-11-25 10:47:38 +05:30
parent 6b71a1130f
commit cca5f55a4d
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/tbl_common.inc.php
View File

@ -45,21 +45,4 @@ $err_url = $cfg['DefaultTabTable'] . PMA_URL_getCommon($url_params);
*/
require_once './libraries/db_table_exists.lib.php';
if (PMA_Tracker::isActive()
&& PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
&& ! isset($_REQUEST['submit_deactivate_now'])
&& ! (isset($_REQUEST['report_export'])
&& $_REQUEST['export_type'] == 'sqldumpfile')
) {
$temp_msg = '<a href="tbl_tracking.php' . $url_query . '">';
$temp_msg .= sprintf(
__('Tracking of %s is activated.'),
htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])
);
$temp_msg .= '</a>';
$msg = PMA_Message::notice($temp_msg);
PMA_Response::getInstance()->addHTML($msg->getDisplay());
}
?>

16
tbl_tracking.php
View File

@ -13,6 +13,22 @@ require_once './libraries/tracking.lib.php';
define('TABLE_MAY_BE_ABSENT', true);
require './libraries/tbl_common.inc.php';
if (PMA_Tracker::isActive()
&& PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
&& ! isset($_REQUEST['submit_deactivate_now'])
&& ! (isset($_REQUEST['report_export'])
&& $_REQUEST['export_type'] == 'sqldumpfile')
) {
$msg = PMA_Message::notice(
sprintf(
__('Tracking of %s is activated.'),
htmlspecialchars($GLOBALS["db"] . '.' . $GLOBALS["table"])
)
);
PMA_Response::getInstance()->addHTML($msg->getDisplay());
}
$url_query .= '&amp;goto=tbl_tracking.php&amp;back=tbl_tracking.php';
$url_params['goto'] = 'tbl_tracking.php';
$url_params['back'] = 'tbl_tracking.php';