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

Removed unresolved section

Browse Source
This commit is contained in:
ninadsp
2010-07-29 21:26:21 +05:30
parent a2f78a6d38
commit cd42d616f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql.php
View File

@@ -10,6 +10,7 @@
* Gets some core libraries * Gets some core libraries
*/ */
require_once './libraries/common.inc.php'; require_once './libraries/common.inc.php';
require_once './libraries/Table.class.php';
require_once './libraries/check_user_privileges.lib.php'; require_once './libraries/check_user_privileges.lib.php';
require_once './libraries/bookmark.lib.php'; require_once './libraries/bookmark.lib.php';
@@ -667,11 +668,10 @@ else {
if (isset($printview) && $printview == '1') { if (isset($printview) && $printview == '1') {
require_once './libraries/header_printview.inc.php'; require_once './libraries/header_printview.inc.php';
} else { } else {
<<<<<<< HEAD
$GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'functions.js';
$GLOBALS['js_include'][] = 'sql.js'; $GLOBALS['js_include'][] = 'sql.js';
=======
>>>>>>> origin/master
unset($message); unset($message);
if( $GLOBALS['is_ajax_request'] != true) { if( $GLOBALS['is_ajax_request'] != true) {