Resolve merge conflicts for upstream merge
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
* Run common work
|
||||
*/
|
||||
require_once './libraries/common.inc.php';
|
||||
require_once './libraries/Table.class.php';
|
||||
|
||||
//Get some js files needed for Ajax
|
||||
$GLOBALS['js_include'][] = 'jquery/jquery-ui-1.8.custom.js';
|
||||
@@ -22,9 +21,6 @@ $url_query .= '&goto=tbl_tracking.php&back=db_tracking.php';
|
||||
$sub_part = '_structure';
|
||||
require './libraries/db_info.inc.php';
|
||||
|
||||
// Get relation settings
|
||||
require_once './libraries/relation.lib.php';
|
||||
|
||||
// Work to do?
|
||||
// (here, do not use $_REQUEST['db] as it can be crafted)
|
||||
if (isset($_REQUEST['delete_tracking']) && isset($_REQUEST['table'])) {
|
||||
@@ -48,7 +44,7 @@ if ($num_tables == 0 && count($data['ddlog']) == 0) {
|
||||
}
|
||||
|
||||
// Display the footer
|
||||
require_once './libraries/footer.inc.php';
|
||||
require './libraries/footer.inc.php';
|
||||
exit;
|
||||
}
|
||||
|
||||
@@ -212,5 +208,5 @@ if (count($data['ddlog']) > 0) {
|
||||
/**
|
||||
* Display the footer
|
||||
*/
|
||||
require_once './libraries/footer.inc.php';
|
||||
require './libraries/footer.inc.php';
|
||||
?>
|
||||
|
Reference in New Issue
Block a user