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

Try a fix for bug #446982 (Dump files ignored with Windows server)

Browse Source
This commit is contained in:
Loïc Chapeaux
2001-08-08 16:58:44 +00:00
parent 3f9a9e7b12
commit 745fa627a3
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -8,7 +8,7 @@ $Source$
2001-08-08 Olivier M<>ller <om@omnis.ch> 2001-08-08 Olivier M<>ller <om@omnis.ch>
* new script create-release.sh * new script create-release.sh
* moved scripts to a new subdirectory "scripts/" * moved scripts to a new subdirectory "scripts/"
2001-08-08 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2001-08-08 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* tbl_replace.php3: fixed some coding style inconcistencies and optimized a * tbl_replace.php3: fixed some coding style inconcistencies and optimized a
bit both the '$set$' switch cases. bit both the '$set$' switch cases.
@@ -19,6 +19,8 @@ $Source$
- merged patch #443393. - merged patch #443393.
* tbl_select.php3, lang/*: applied patch #443230 (Display order in * tbl_select.php3, lang/*: applied patch #443230 (Display order in
tbl_select.php3). tbl_select.php3).
* db_readdump.php3, lines 51-53: try a fix for bug #446982 (Dump files
ignored with Windows server).
2001-08-08 Steve Alberty <alberty@neptunlabs.de> 2001-08-08 Steve Alberty <alberty@neptunlabs.de>
* tbl_replace.php3: remove warning in a new row if a 'set' field is not * tbl_replace.php3: remove warning in a new row if a 'set' field is not

4
db_readdump.php3
View File

@@ -48,7 +48,9 @@ if (!empty($id_bookmark)) {
*/ */
// Gets the query from a file if required // Gets the query from a file if required
if ($sql_file != 'none') { if ($sql_file != 'none') {
if (ereg('^php[0-9A-Za-z_.-]+$', basename($sql_file))) { // loic1: php < 4.05 for windows seems not to list the regexp test
// if (ereg('^php[0-9A-Za-z_.-]+$', basename($sql_file))) {
if (file_exists($sql_file)) {
$sql_query = fread(fopen($sql_file, 'r'), filesize($sql_file)); $sql_query = fread(fopen($sql_file, 'r'), filesize($sql_file));
if (get_magic_quotes_runtime() == 1) { if (get_magic_quotes_runtime() == 1) {
$sql_query = stripslashes($sql_query); $sql_query = stripslashes($sql_query);