- Patch #797458 by Heine: declaration of NodeController::buildQuery() should be compatible with that of DrupalDefaultEntityController::buildQuery().

merge-requests/26/head
Dries Buytaert 2010-05-17 07:43:36 +00:00
parent f11db319d0
commit 689d51747b
1 changed files with 1 additions and 1 deletions

View File

@ -3647,7 +3647,7 @@ class NodeController extends DrupalDefaultEntityController {
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,
// alias timestamp to revision_timestamp and add revision_uid.
$query = parent::buildQuery($ids, $conditions, $revision_id);