From 1ecffc35cdbcd6c5bacc56b8b3085b7fb7762457 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 9 May 2010 13:27:31 +0000
Subject: - Patch #566940 by catch: move node specific code out of entity.inc.

---
 modules/node/node.module | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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

diff --git a/modules/node/node.module b/modules/node/node.module
index d751a511b..dc6532483 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -3651,4 +3651,16 @@ class NodeController extends DrupalDefaultEntityController {
     $this->hookLoadArguments[] = array_keys($typed_nodes);
     parent::attachLoad($nodes, $revision_id);
   }
+
+  protected function buildQuery($ids, $conditions, $revision_id) {
+    // Ensure that uid is taken from the {node} table,
+    // alias timestamp to revision_timestamp and add revision_uid.
+    $query = parent::buildQuery($ids, $conditions, $revision_id);
+    $fields =& $query->getFields();
+    unset($fields['timestamp']);
+    $query->addField('revision', 'timestamp', 'revision_timestamp');
+    $fields['uid']['table'] = 'base';
+    $query->addField('revision', 'uid', 'revision_uid');
+    return $query;
+  }
 }
-- 
cgit v1.2.3