diff options
author | Dries Buytaert <dries@buytaert.net> | 2004-12-20 22:01:17 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2004-12-20 22:01:17 +0000 |
commit | 0b18bf0e6bc2c1f0a150b0f87488f33e6f464ce6 (patch) | |
tree | 78aeb93c302d6074299024bf927703f0d06b253a /modules | |
parent | 9f7b16ada9eb84b6459f4cc5ad4c9bc735fc1be7 (diff) | |
download | brdo-0b18bf0e6bc2c1f0a150b0f87488f33e6f464ce6.tar.gz brdo-0b18bf0e6bc2c1f0a150b0f87488f33e6f464ce6.tar.bz2 |
- Patch #14614 by Neil: made the archive module respect the node-level permissions.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/archive.module | 3 | ||||
-rw-r--r-- | modules/archive/archive.module | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/modules/archive.module b/modules/archive.module index 0853bfdee..c2bde631b 100644 --- a/modules/archive.module +++ b/modules/archive.module @@ -72,8 +72,7 @@ function archive_calendar($original = 0) { $nextmonth = mktime(23, 59, 59, $month + 1, 1, $year); $next = mktime(23, 59, 59, $month + 1, min(date('t', $nextmonth), $day), $year); - - $result = db_query("SELECT created FROM {node} WHERE status = 1 AND created > $start_of_month AND created < $end_of_month"); + $result = db_query('SELECT DISTINCT(n.nid), n.created FROM {node} n '. node_access_join_sql() .' WHERE n.status = 1 AND n.created > %d AND n.created < %d AND '. node_access_where_sql() .' ORDER BY n.created', $start_of_month, $end_of_month); $days_with_posts = array(); while ($day_with_post = db_fetch_object($result)) { diff --git a/modules/archive/archive.module b/modules/archive/archive.module index 0853bfdee..c2bde631b 100644 --- a/modules/archive/archive.module +++ b/modules/archive/archive.module @@ -72,8 +72,7 @@ function archive_calendar($original = 0) { $nextmonth = mktime(23, 59, 59, $month + 1, 1, $year); $next = mktime(23, 59, 59, $month + 1, min(date('t', $nextmonth), $day), $year); - - $result = db_query("SELECT created FROM {node} WHERE status = 1 AND created > $start_of_month AND created < $end_of_month"); + $result = db_query('SELECT DISTINCT(n.nid), n.created FROM {node} n '. node_access_join_sql() .' WHERE n.status = 1 AND n.created > %d AND n.created < %d AND '. node_access_where_sql() .' ORDER BY n.created', $start_of_month, $end_of_month); $days_with_posts = array(); while ($day_with_post = db_fetch_object($result)) { |