diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-03-15 15:23:38 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2007-03-15 15:23:38 +0000 |
| commit | cbf8b1f65e9f03d13fa122f9e1f13542a15a8fe2 (patch) | |
| tree | ae6713825ea75bb617858d127102fbf22abadd69 /includes/database.inc | |
| parent | c194755d39afd4c2b513fd6420119c6add1285fb (diff) | |
| download | brdo-cbf8b1f65e9f03d13fa122f9e1f13542a15a8fe2.tar.gz brdo-cbf8b1f65e9f03d13fa122f9e1f13542a15a8fe2.tar.bz2 | |
#126867: Reverting bad db_prefix_tables change.
Diffstat (limited to 'includes/database.inc')
| -rw-r--r-- | includes/database.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/database.inc b/includes/database.inc index 877d950cd..9a837a576 100644 --- a/includes/database.inc +++ b/includes/database.inc @@ -177,7 +177,7 @@ define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b)/'); * A variable number of arguments which are substituted into the query * using printf() syntax. Instead of a variable number of 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 * in '') and %%. * @@ -191,12 +191,12 @@ define('DB_QUERY_REGEXP', '/(%d|%s|%%|%f|%b)/'); function db_query($query) { $args = func_get_args(); array_shift($args); + $query = db_prefix_tables($query); if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax $args = $args[0]; } _db_query_callback($args, TRUE); $query = preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $query); - $query = db_prefix_tables($query); return _db_query($query); } |