From 5278747df5b6b9b0a645093cd4ea08fea4a675aa Mon Sep 17 00:00:00 2001
From: Neil Drumm <drumm@3064.no-reply.drupal.org>
Date: Thu, 16 Nov 2006 08:32:19 +0000
Subject: #86842 by pwolanin. Don't attempt to clone non-object nodes.

---
 modules/node/node.module | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'modules/node/node.module')

diff --git a/modules/node/node.module b/modules/node/node.module
index de76ae1ba..c370c368a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -479,11 +479,12 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
     $nodes = array();
   }
 
+  $cachable = FALSE;
   $arguments = array();
   if (is_numeric($param)) {
     $cachable = $revision == NULL;
     if ($cachable && isset($nodes[$param])) {
-      return drupal_clone($nodes[$param]);
+      return is_object($nodes[$param]) ? drupal_clone($nodes[$param]) : $nodes[$param];
     }
     $cond = 'n.nid = %d';
     $arguments[] = $param;
@@ -524,7 +525,7 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
   }
 
   if ($cachable) {
-    $nodes[$param] = drupal_clone($node);
+    $nodes[$param] = is_object($node) ? drupal_clone($node) : $node;
   }
 
   return $node;
-- 
cgit v1.2.3