summaryrefslogtreecommitdiff
path: root/modules/node
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2007-06-24 00:38:40 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2007-06-24 00:38:40 +0000
commit028c8e60504546b1ad2342f168bbf5bf3d25f618 (patch)
treeabff3976f64cfab51a953c05a178de43e8e03bcb /modules/node
parentb1d45297e7ea4b26c7b8f484bddae704a26e2c34 (diff)
downloadbrdo-028c8e60504546b1ad2342f168bbf5bf3d25f618.tar.gz
brdo-028c8e60504546b1ad2342f168bbf5bf3d25f618.tar.bz2
#148678: Fix notices/warnings on invalid paths like 'node/zzz'. (chx/pwolanin/webernet)
Diffstat (limited to 'modules/node')
-rw-r--r--modules/node/node.module5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/node/node.module b/modules/node/node.module
index f1f6c2440..6463a7f81 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -568,7 +568,7 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
$cond = 'n.nid = %d';
$arguments[] = $param;
}
- else {
+ elseif (is_array($param)) {
// Turn the conditions into a query.
foreach ($param as $key => $value) {
$cond[] = 'n.'. db_escape_string($key) ." = '%s'";
@@ -576,6 +576,9 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
}
$cond = implode(' AND ', $cond);
}
+ else {
+ return FALSE;
+ }
// Retrieve the node.
// No db_rewrite_sql is applied so as to get complete indexing for search.