summaryrefslogtreecommitdiff
path: root/modules/user/user.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-03-05 13:41:04 +0000
committerDries Buytaert <dries@buytaert.net>2010-03-05 13:41:04 +0000
commit72df65d1e009137b57132739de68936c9395dca6 (patch)
tree460cc16ef0b8d2efd27be113f819a134cac93eb6 /modules/user/user.module
parentd058394cf373ca3529ff169db148478fa30aa414 (diff)
downloadbrdo-72df65d1e009137b57132739de68936c9395dca6.tar.gz
brdo-72df65d1e009137b57132739de68936c9395dca6.tar.bz2
- Patch #731426 by fago: recursed entity loading didn't work.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r--modules/user/user.module5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/user/user.module b/modules/user/user.module
index cff023dfa..8729c563d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -228,7 +228,8 @@ function user_load_multiple($uids = array(), $conditions = array(), $reset = FAL
* special handling for user objects.
*/
class UserController extends DrupalDefaultEntityController {
- function attachLoad(&$queried_users) {
+
+ function attachLoad(&$queried_users, $revision_id = FALSE) {
// Build an array of user picture IDs so that these can be fetched later.
$picture_fids = array();
foreach ($queried_users as $key => $record) {
@@ -263,7 +264,7 @@ class UserController extends DrupalDefaultEntityController {
}
// Call the default attachLoad() method. This will add fields and call
// hook_user_load().
- parent::attachLoad($queried_users);
+ parent::attachLoad($queried_users, $revision_id);
}
}