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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-02-17 14:40:05 +01:00
parent 3c2d9d54d3 4a6adc7e29
commit 54e959ee59
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql.php
View File

@@ -391,11 +391,6 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
*/ */
require './' . PMA_securePath($goto); require './' . PMA_securePath($goto);
} else { } else {
/**
* HTML header.
*/
require_once './libraries/header.inc.php';
$full_err_url = (preg_match('@^(db|tbl)_@', $err_url)) $full_err_url = (preg_match('@^(db|tbl)_@', $err_url))
? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query) ? $err_url . '&show_query=1&sql_query=' . urlencode($sql_query)
: $err_url; : $err_url;

4
tbl_replace.php
View File

@@ -325,7 +325,9 @@ if ($is_insert && count($value_sets) > 0) {
// No change -> move back to the calling script // No change -> move back to the calling script
$message = PMA_Message::success(__('No change')); $message = PMA_Message::success(__('No change'));
$active_page = $goto_include; $active_page = $goto_include;
require_once './libraries/header.inc.php'; if(!$GLOBALS['is_ajax_request'] == true) {
require_once './libraries/header.inc.php';
}
require './' . PMA_securePath($goto_include); require './' . PMA_securePath($goto_include);
exit; exit;
} }