summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2001-06-05 18:32:04 +0000
committerDries Buytaert <dries@buytaert.net>2001-06-05 18:32:04 +0000
commitf490fc26dfa77a1b4ababa48e9e730c0c8955668 (patch)
tree92f83591e81987e2f20fa0d6d79e43ee1fcdb8f0
parentca908eb724640883ce1cf1de1ce77599a044d54d (diff)
downloadbrdo-f490fc26dfa77a1b4ababa48e9e730c0c8955668.tar.gz
brdo-f490fc26dfa77a1b4ababa48e9e730c0c8955668.tar.bz2
- Improved node_query such that an 'illegal offset' is less likekely to
happen.
-rw-r--r--modules/node.module4
-rw-r--r--modules/node/node.module4
2 files changed, 4 insertions, 4 deletions
diff --git a/modules/node.module b/modules/node.module
index 4bb325428..55c6feb0d 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -124,7 +124,7 @@ function node_delete($id) {
return (node_del(array("nid" => $id)) ? "node has been deleted." : "failed to delete node: node must be dumped first.");
}
-function node_query($type = "") {
+function node_query($type = -1) {
$queries[] = array("all nodes: recent additions", "ORDER BY n.timestamp DESC");
$queries[] = array("all nodes: status set to 'posted'", "WHERE n.status = '". node_status("posted") ."' ORDER BY n.timestamp DESC");
$queries[] = array("all nodes: status set to 'queued'", "WHERE n.status = '". node_status("queued") ."' ORDER BY n.timestamp DESC");
@@ -145,7 +145,7 @@ function node_query($type = "") {
}
}
- return ($queries[$type] ? $queries[$type] : $queries);
+ return ($type < 0 ? $queries : $queries[$type]);
}
function node_listing($queries) {
diff --git a/modules/node/node.module b/modules/node/node.module
index 4bb325428..55c6feb0d 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -124,7 +124,7 @@ function node_delete($id) {
return (node_del(array("nid" => $id)) ? "node has been deleted." : "failed to delete node: node must be dumped first.");
}
-function node_query($type = "") {
+function node_query($type = -1) {
$queries[] = array("all nodes: recent additions", "ORDER BY n.timestamp DESC");
$queries[] = array("all nodes: status set to 'posted'", "WHERE n.status = '". node_status("posted") ."' ORDER BY n.timestamp DESC");
$queries[] = array("all nodes: status set to 'queued'", "WHERE n.status = '". node_status("queued") ."' ORDER BY n.timestamp DESC");
@@ -145,7 +145,7 @@ function node_query($type = "") {
}
}
- return ($queries[$type] ? $queries[$type] : $queries);
+ return ($type < 0 ? $queries : $queries[$type]);
}
function node_listing($queries) {