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

Use define rather than variable for conditional paths.

Browse Source
This commit is contained in:
Michal Čihař
2005-11-15 11:14:17 +00:00
parent 0ccc8c8611
commit 94355887ce
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -9,6 +9,9 @@ $Source$
* css/phpmyadmin.css.php: Do not use common header file, as there is * css/phpmyadmin.css.php: Do not use common header file, as there is
nothing common at all. nothing common at all.
* libraries/header_http.inc.php: Allways send text/html content type. * libraries/header_http.inc.php: Allways send text/html content type.
* libraries/db_table_exists.lib.php, libraries/header_http.inc.php,
transformation_wrapper.php: Use define rather than variable for
conditional paths.
2005-11-14 Michal Čihař <michal@cihar.com> 2005-11-14 Michal Čihař <michal@cihar.com>
* libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776). * libraries/sql_query_form.lib.php: Fix %f expansion (bug #1355776).

4
libraries/db_table_exists.lib.php
View File

@@ -12,7 +12,7 @@ if (!isset($is_db) || !$is_db) {
$is_db = @PMA_DBI_select_db($db); $is_db = @PMA_DBI_select_db($db);
} }
if (empty($db) || !$is_db) { if (empty($db) || !$is_db) {
if (!isset($is_transformation_wrapper)) { if (!defined('IS_TRANSFORMATION_WRAPPER')) {
PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1'); PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . 'main.php?' . PMA_generate_common_url('', '', '&') . (isset($message) ? '&message=' . urlencode($message) : '') . '&reload=1');
} }
exit; exit;
@@ -26,7 +26,7 @@ if (!isset($is_table) || !$is_table) {
if (empty($table) if (empty($table)
|| !($is_table && @PMA_DBI_num_rows($is_table))) { || !($is_table && @PMA_DBI_num_rows($is_table))) {
$redirect = TRUE; $redirect = TRUE;
if (!isset($is_transformation_wrapper)) { if (!defined('IS_TRANSFORMATION_WRAPPER')) {
$redirect = TRUE; $redirect = TRUE;
if (!empty($table)) { if (!empty($table)) {
PMA_DBI_free_result($is_table); PMA_DBI_free_result($is_table);

2
libraries/header_http.inc.php
View File

@@ -10,7 +10,7 @@ header('Expires: ' . $GLOBALS['now']); // rfc2616 - Section 14.21
header('Last-Modified: ' . $GLOBALS['now']); header('Last-Modified: ' . $GLOBALS['now']);
header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1 header('Cache-Control: no-store, no-cache, must-revalidate, pre-check=0, post-check=0, max-age=0'); // HTTP/1.1
header('Pragma: no-cache'); // HTTP/1.0 header('Pragma: no-cache'); // HTTP/1.0
if (!isset($is_transformation_wrapper)) { if (!defined('IS_TRANSFORMATION_WRAPPER')) {
// Define the charset to be used // Define the charset to be used
header('Content-Type: text/html; charset=' . $GLOBALS['charset']); header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
} }

2
transformation_wrapper.php
View File

@@ -2,7 +2,7 @@
/* $Id$ */ /* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
$is_transformation_wrapper = true; define('IS_TRANSFORMATION_WRAPPER', true);
/** /**
* Get the variables sent or posted to this script and displays the header * Get the variables sent or posted to this script and displays the header