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

Resolve merge conflicts for upstream merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 19:17:25 +05:30
parent 2bec345a46 d0fc397fe1
commit a2f78a6d38
175 changed files with 76587 additions and 70379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tbl_tracking.php
View File

@@ -7,7 +7,6 @@
// Run common work
require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php';
define('TABLE_MAY_BE_ABSENT', true);
require './libraries/tbl_common.php';
@@ -15,9 +14,6 @@ $url_query .= '&goto=tbl_tracking.php&back=tbl_tracking.php';
$url_params['goto'] = 'tbl_tracking.php';;
$url_params['back'] = 'tbl_tracking.php';
// Get relation settings
require_once './libraries/relation.lib.php';
// Init vars for tracking report
if (isset($_REQUEST['report']) || isset($_REQUEST['report_export'])) {
$data = PMA_Tracker::getTrackedData($_REQUEST['db'], $_REQUEST['table'], $_REQUEST['version']);
@@ -233,7 +229,6 @@ if (isset($_REQUEST['report_export']) && $_REQUEST['export_type'] == 'sqldump')
$table_temp = $table;
$db = $table = '';
$GLOBALS['js_include'][] = 'functions.js';
require_once './libraries/sql_query_form.lib.php';
PMA_sqlQueryForm($new_query, 'sql');
@@ -695,5 +690,5 @@ if ($last_version > 0) {
/**
* Displays the footer
*/
require_once './libraries/footer.inc.php';
require './libraries/footer.inc.php';
?>