From 711b947854114cdb41b4f98b3437a8d4e18894c0 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 21 Dec 2006 22:22:14 +0000
Subject: - Patch #104618 by robertDouglas and jvandyk: fixed node caching.

---
 modules/node/node.module | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

diff --git a/modules/node/node.module b/modules/node/node.module
index 16d226f03..81f311db8 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -490,10 +490,9 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
     $nodes = array();
   }
 
-  $cachable = FALSE;
+  $cachable = ($revision == NULL);
   $arguments = array();
   if (is_numeric($param)) {
-    $cachable = $revision == NULL;
     if ($cachable && isset($nodes[$param])) {
       return is_object($nodes[$param]) ? drupal_clone($nodes[$param]) : $nodes[$param];
     }
@@ -533,10 +532,9 @@ function node_load($param = array(), $revision = NULL, $reset = NULL) {
         $node->$key = $value;
       }
     }
-  }
-
-  if ($cachable) {
-    $nodes[$param] = is_object($node) ? drupal_clone($node) : $node;
+    if ($cachable) {
+      $nodes[$node->nid] = is_object($node) ? drupal_clone($node) : $node;
+    }
   }
 
   return $node;
-- 
cgit v1.2.3