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

Fixed displaying of tables with quote in name.

Browse Source
This commit is contained in:
Michal Čihař
2003-05-13 08:44:35 +00:00
parent 5557d911ab
commit 724e56b334
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2003-05-13 Michal Cihar <nijel@users.sourceforge.net>
* left.php3: Fixed displaying of tables with quote in name.
2003-05-12 Garvin Hicking <me@supergarv.de> 2003-05-12 Garvin Hicking <me@supergarv.de>
* queryframe.php3: Remove left/bottom margin to better fit the link title * queryframe.php3: Remove left/bottom margin to better fit the link title
in the small frame. in the small frame.

6
left.php3
View File

@@ -465,7 +465,7 @@ if ($num_dbs > 1) {
// garvin: Check whether to display nested sets // garvin: Check whether to display nested sets
if (!empty($cfg['LeftFrameTableSeparator'])) { if (!empty($cfg['LeftFrameTableSeparator'])) {
$_table = explode($cfg['LeftFrameTableSeparator'], $table); $_table = explode($cfg['LeftFrameTableSeparator'], ereg_replace('\'', '\\\'',$table));
if (is_array($_table)) { if (is_array($_table)) {
reset($_table); reset($_table);
while(list($key, $val) = each($_table)) { while(list($key, $val) = each($_table)) {
@@ -477,8 +477,8 @@ if ($num_dbs > 1) {
unset($_table[count($_table)-1]); unset($_table[count($_table)-1]);
$_table = PMA_reduceNest($_table); $_table = PMA_reduceNest($_table);
$eval_string = '$tablestack[\'' . implode('\'][\'', $_table) . '\'][\'pma_name\'][] = \'' . $table . '\';'; $eval_string = '$tablestack[\'' . implode('\'][\'', $_table) . '\'][\'pma_name\'][] = \'' . ereg_replace('\'', '\\\'', $table) . '\';';
$eval_string .= '$tablestack[\'' . implode('\'][\'', $_table) . '\'][\'pma_list_item\'][] = \'' . $list_item . '\';'; $eval_string .= '$tablestack[\'' . implode('\'][\'', $_table) . '\'][\'pma_list_item\'][] = \'' . ereg_replace('\'', '\\\'', $list_item) . '\';';
eval($eval_string); eval($eval_string);
} else { } else {
$tablestack['__protected__']['pma_name'][] = $table; $tablestack['__protected__']['pma_name'][] = $table;