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

Fix including of files when search path does not contain current directory.

Browse Source
This commit is contained in:
Michal Čihař
2005-10-30 18:51:34 +00:00
parent e6c5fd8027
commit 7ae4646de6
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -14,6 +14,8 @@ $Source$
name (bug #1180668). name (bug #1180668).
* libraries/common.lib.php: Do not escape SQL query twice while showing it * libraries/common.lib.php: Do not escape SQL query twice while showing it
in error message (bug #1336452). in error message (bug #1336452).
* left.php, querywindow.php, tbl_query_box.php: Fix including of files
when search path does not contain current directory.
2005-10-29 Michal Čihař <michal@cihar.com> 2005-10-29 Michal Čihař <michal@cihar.com>
* Documentation.html, config.default.php, libraries/common.lib.php: Link * Documentation.html, config.default.php, libraries/common.lib.php: Link

2
left.php
View File

@@ -111,7 +111,7 @@ echo "<?xml version=\"1.0\" encoding=\"" . $GLOBALS['charset'] . "\"?".">";
<body id="body_leftFrame"> <body id="body_leftFrame">
<?php <?php
require 'libraries/left_header.inc.php'; require './libraries/left_header.inc.php';
if ( $num_dbs === 0 ) { if ( $num_dbs === 0 ) {
// no database available, so we break here // no database available, so we break here

6
querywindow.php
View File

@@ -242,13 +242,13 @@ if ( $GLOBALS['cfg']['QueryFrame'] && ! $GLOBALS['cfg']['QueryFrameJS'] ) {
// ... we redirect to appropriate query sql page // ... we redirect to appropriate query sql page
// works only full if $db and $table is also stored/grabbed from $_COOKIE // works only full if $db and $table is also stored/grabbed from $_COOKIE
if ( ! empty( $table ) ) { if ( ! empty( $table ) ) {
require 'tbl_properties.php'; require './tbl_properties.php';
} }
elseif ( ! empty( $db ) ) { elseif ( ! empty( $db ) ) {
require 'db_details.php'; require './db_details.php';
} }
else { else {
require 'server_sql.php'; require './server_sql.php';
} }
exit; exit;
} }

6
tbl_query_box.php
View File

@@ -30,13 +30,13 @@ if ( $GLOBALS['cfg']['QueryFrame'] && ! $GLOBALS['cfg']['QueryFrameJS']
// ... we redirect to appropriate query sql page // ... we redirect to appropriate query sql page
// works only full if $db and $table is also stored/grabbed from $_COOKIE // works only full if $db and $table is also stored/grabbed from $_COOKIE
if ( ! empty( $table ) ) { if ( ! empty( $table ) ) {
require 'tbl_properties.php'; require './tbl_properties.php';
} }
elseif ( ! empty( $db ) ) { elseif ( ! empty( $db ) ) {
require 'db_details.php'; require './db_details.php';
} }
else { else {
require 'server_sql.php'; require './server_sql.php';
} }
exit; exit;
} }