diff options
| author | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
|---|---|---|
| committer | ninadsp <ninadsp16289@gmail.com> | 2010-07-29 17:47:25 +0400 |
| commit | a2f78a6d38f74f0cc62f2a5837e682901331c21e (patch) | |
| tree | ceab0c3ae4efe05fe345f270bdf4d236d24ef63d /tbl_addfield.php | |
| parent | 2bec345a46d11293b93c2b06bf8009c913cde8fb (diff) | |
| parent | d0fc397fe1c474150883e85a791a012a7ae03380 (diff) | |
Resolve merge conflicts for upstream merge
Diffstat (limited to 'tbl_addfield.php')
| -rwxr-xr-x | tbl_addfield.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/tbl_addfield.php b/tbl_addfield.php index b61327fb40..ec910fdf4b 100755 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -9,9 +9,7 @@ * Get some core libraries */ require_once './libraries/common.inc.php'; -require_once './libraries/Table.class.php'; -$GLOBALS['js_include'][] = 'functions.js'; require_once './libraries/header.inc.php'; // Check parameters @@ -165,7 +163,6 @@ if (isset($_REQUEST['do_save_data'])) { if ($result === true) { // If comments were sent, enable relation stuff - require_once './libraries/relation.lib.php'; require_once './libraries/transformations.lib.php'; // Update comment table for mime types [MIME] @@ -226,7 +223,7 @@ if ($abort == false) { require_once './libraries/tbl_properties.inc.php'; // Diplays the footer - require_once './libraries/footer.inc.php'; + require './libraries/footer.inc.php'; } ?> |