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

correctly unquote identifiers

Browse Source
This commit is contained in:
Sebastian Mendel
2006-08-02 11:36:12 +00:00
parent 179917ec41
commit 6d9f3794ec
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -18,6 +18,7 @@ $Source$
- added PMA_unQuote() to remove quotes from strings - added PMA_unQuote() to remove quotes from strings
* libraries/footer.inc.php: correctly escape strings inside JavaScript * libraries/footer.inc.php: correctly escape strings inside JavaScript
(part of bug #1532721) (part of bug #1532721)
* libraries/sqlparser.lib.php: correctly unquote identifiers
2006-08-01 Marc Delisle <lem9@users.sourceforge.net> 2006-08-01 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: patch #1532493 + light editing from me, * Documentation.html: patch #1532493 + light editing from me,

10
libraries/sqlparser.lib.php
View File

@@ -1022,16 +1022,10 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
$identifier = $arr[$i]['data']; $identifier = $arr[$i]['data'];
break; break;
//TODO: check embedded double quotes or backticks?
// and/or remove just the first and last character?
case 'quote_backtick': case 'quote_backtick':
$identifier = str_replace('`', '', $arr[$i]['data']);
break;
case 'quote_double': case 'quote_double':
$identifier = str_replace('"', '', $arr[$i]['data']);
break;
case 'quote_single': case 'quote_single':
$identifier = str_replace("'", "", $arr[$i]['data']); $identifier = PMA_unQuote($arr[$i]['data']);
break; break;
} // end switch } // end switch
@@ -1732,7 +1726,7 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
if ($arr[$i]['type'] == 'quote_backtick') { if ($arr[$i]['type'] == 'quote_backtick') {
// remove backquotes // remove backquotes
$identifier = str_replace('`', '', $arr[$i]['data']); $identifier = PMA_unQuote($arr[$i]['data']);
} else { } else {
$identifier = $arr[$i]['data']; $identifier = $arr[$i]['data'];
} }