summaryrefslogtreecommitdiff
path: root/modules/node.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2002-01-31 20:23:44 +0000
committerDries Buytaert <dries@buytaert.net>2002-01-31 20:23:44 +0000
commitc1c612b12826ab9bf65283f5430f4c7558e24699 (patch)
treea77fe6d40f7412e8aa89102c3ff25460c8c3540e /modules/node.module
parent64d11e1cc2a330778bb57dff2daf3e5bec29f5ee (diff)
downloadbrdo-c1c612b12826ab9bf65283f5430f4c7558e24699.tar.gz
brdo-c1c612b12826ab9bf65283f5430f4c7558e24699.tar.bz2
- Made the calendar module accept a $date parameter such that you
can jump directly to a certain date in the archives. Also made the calendar link to itself such that it is self-contained. - Code beautifications: quoted a lot of arrays, removed dead code and simplified a few things. - Replaced the Calendar class by one function "calendar_display": using a class (or class instance, or object) doesn't make sense in the archives' case. - Renamed "calendar.module" to "archive.module". - Fixed a /problem/ with node settings not always being saved like expected. - Reorganized the user menu: renamed a couple of links for clarity and structure. - Fixed a few typos.
Diffstat (limited to 'modules/node.module')
-rw-r--r--modules/node.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/node.module b/modules/node.module
index 57fe3ad8c..983dcfd2b 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -1127,7 +1127,7 @@ function node_delete($edit) {
}
function node_page() {
- global $op, $id, $user, $edit, $type, $theme, $meta, $date;
+ global $op, $id, $user, $edit, $type, $theme, $meta;
if ($op == "feed") {
node_feed();
@@ -1167,7 +1167,7 @@ function node_page() {
$theme->box($title, node_delete($edit));
break;
default:
- $result = db_query("SELECT nid, type FROM node WHERE ". ($meta ? "attributes LIKE '%". check_input($meta) ."%' AND " : "") ." promote = '1' AND status = '1' AND (static = '1' OR created <= '". ($date > 0 ? check_input($date) : time()) ."') ORDER BY static DESC,created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
+ $result = db_query("SELECT nid, type FROM node WHERE ". ($meta ? "attributes LIKE '%". check_input($meta) ."%' AND " : "") ." promote = '1' AND status = '1' ORDER BY static DESC, created DESC LIMIT ". ($user->nodes ? $user->nodes : variable_get("default_nodes_main", 10)));
while ($node = db_fetch_object($result)) {
node_view(node_load(array("nid" => $node->nid, "type" => $node->type)), 1);
}