Commit 689d5174 authored by Dries's avatar Dries

- Patch #797458 by Heine: declaration of NodeController::buildQuery() should...

- Patch #797458 by Heine: declaration of NodeController::buildQuery() should be compatible with that of DrupalDefaultEntityController::buildQuery().
parent f11db319
...@@ -3647,7 +3647,7 @@ protected function attachLoad(&$nodes, $revision_id = FALSE) { ...@@ -3647,7 +3647,7 @@ protected function attachLoad(&$nodes, $revision_id = FALSE) {
parent::attachLoad($nodes, $revision_id); parent::attachLoad($nodes, $revision_id);
} }
protected function buildQuery($ids, $conditions, $revision_id) { protected function buildQuery($ids, $conditions = array(), $revision_id = FALSE) {
// Ensure that uid is taken from the {node} table, // Ensure that uid is taken from the {node} table,
// alias timestamp to revision_timestamp and add revision_uid. // alias timestamp to revision_timestamp and add revision_uid.
$query = parent::buildQuery($ids, $conditions, $revision_id); $query = parent::buildQuery($ids, $conditions, $revision_id);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment