Fixed an other bug with escaped wildcards in dbs name
This commit is contained in:
@@ -7,9 +7,9 @@ $Source$
|
|||||||
|
|
||||||
2002-04-13 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
2002-04-13 Lo<4C>c Chapeaux <lolo@phpheaven.net>
|
||||||
* lang/korean.inc.php3: fixed some inconcistencies.
|
* lang/korean.inc.php3: fixed some inconcistencies.
|
||||||
* main.php3, lines 200-201; user_details.php3, line 82: fixed a bug with
|
* main.php3, lines 200-201; user_details.php3, line 82 & 1339-1344: fixed
|
||||||
privileges when applied to database name containing an escaped wilcard
|
bugs with privileges when applied to database name containing an escaped
|
||||||
character (then used a litteral charcter). Thanks to
|
wilcard character (then used a litteral charcter). Thanks to
|
||||||
Mike Eheler <meheler @ users.sourceforge.net>.
|
Mike Eheler <meheler @ users.sourceforge.net>.
|
||||||
* tbl_alter.php3, lines 109-112: fixed bug #543365 - Can't change field
|
* tbl_alter.php3, lines 109-112: fixed bug #543365 - Can't change field
|
||||||
properties when name contains localized characters.
|
properties when name contains localized characters.
|
||||||
|
@@ -1336,6 +1336,13 @@ else if (isset($grants) && $grants) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} // end if
|
} // end if
|
||||||
|
|
||||||
|
// Escape wilcard characters if required
|
||||||
|
if (isset($dbgrant) && !$anydb && !$newdb) {
|
||||||
|
$re = '(^|(\\\\\\\\)+|[^\])(_|%)'; // non-escaped wildcards
|
||||||
|
$dbgrant = ereg_replace($re, '\\\\3', $dbgrant);
|
||||||
|
}
|
||||||
|
|
||||||
if (!$newdb) {
|
if (!$newdb) {
|
||||||
$sql_query .= ' ON '
|
$sql_query .= ' ON '
|
||||||
. (($anydb || $dbgrant == '') ? '*' : PMA_backquote($dbgrant))
|
. (($anydb || $dbgrant == '') ? '*' : PMA_backquote($dbgrant))
|
||||||
|
Reference in New Issue
Block a user