summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-11-29 15:37:27 +0000
committerDries Buytaert <dries@buytaert.net>2005-11-29 15:37:27 +0000
commit7a341583be3928a5fb5deac375b0d3d029b2cf6b (patch)
treec7c2e5e9163ea94ab92a1d008a52a0c2c6e7b476
parent1b9b51f3def992d2601a8f36607fc7de34527a49 (diff)
downloadbrdo-7a341583be3928a5fb5deac375b0d3d029b2cf6b.tar.gz
brdo-7a341583be3928a5fb5deac375b0d3d029b2cf6b.tar.bz2
- Patch #39257 by merlinofchaos: node_access rewrite breaks with FROM_UNIXTIME.
-rw-r--r--includes/database.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database.inc b/includes/database.inc
index d43fd5ff2..744284ece 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -278,7 +278,7 @@ function db_rewrite_sql($query, $primary_table = 'n', $primary_field = 'nid', $
}
if (!empty($join)) {
- $query = preg_replace('|FROM[^[:upper:]/,]+|','\0 '. $join .' ', $query);
+ $query = preg_replace('|FROM[^[:upper:]/,_]+|','\0 '. $join .' ', $query);
}
if (!empty($where)) {