Commit cbf8b1f6 authored by Steven Wittens's avatar Steven Wittens
Browse files

#126867: Reverting bad db_prefix_tables change.

parent c194755d
...@@ -177,7 +177,7 @@ function _db_query_callback($match, $init = FALSE) { ...@@ -177,7 +177,7 @@ function _db_query_callback($match, $init = FALSE) {
* A variable number of arguments which are substituted into the query * A variable number of arguments which are substituted into the query
* using printf() syntax. Instead of a variable number of query arguments, * using printf() syntax. Instead of a variable number of query arguments,
* you may also pass a single array containing the query arguments. * you may also pass a single array containing the query arguments.
*
* Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose * Valid %-modifiers are: %s, %d, %f, %b (binary data, do not enclose
* in '') and %%. * in '') and %%.
* *
...@@ -191,12 +191,12 @@ function _db_query_callback($match, $init = FALSE) { ...@@ -191,12 +191,12 @@ function _db_query_callback($match, $init = FALSE) {
function db_query($query) { function db_query($query) {
$args = func_get_args(); $args = func_get_args();
array_shift($args); array_shift($args);
$query = db_prefix_tables($query);
if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
$args = $args[0]; $args = $args[0];
} }
_db_query_callback($args, TRUE); _db_query_callback($args, TRUE);
$query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query);
$query = db_prefix_tables($query);
return _db_query($query); return _db_query($query);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment