diff options
author | Dries Buytaert <dries@buytaert.net> | 2009-12-26 16:50:09 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2009-12-26 16:50:09 +0000 |
commit | 53748ab5e24de5e33e9cf115e91a5845daa2ecbd (patch) | |
tree | 6a2c0c9d2f933ef6d112db66a4655ce0f557126a /modules/user/user.module | |
parent | a838c8be49ed46f9ffb911113c55f9944ae7f952 (diff) | |
download | brdo-53748ab5e24de5e33e9cf115e91a5845daa2ecbd.tar.gz brdo-53748ab5e24de5e33e9cf115e91a5845daa2ecbd.tar.bz2 |
- Patch #664544 by yched: clean-up entity build/view modes.
Diffstat (limited to 'modules/user/user.module')
-rw-r--r-- | modules/user/user.module | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/modules/user/user.module b/modules/user/user.module index 432f936b9..9767c3288 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -142,25 +142,17 @@ function user_entity_info() { ), ), ), + 'view modes' => array( + 'full' => array( + 'label' => t('User account'), + ), + ), ), ); return $return; } /** - * Implements hook_field_build_modes(). - */ -function user_field_build_modes($obj_type) { - $modes = array(); - if ($obj_type == 'user') { - $modes = array( - 'full' => t('User account'), - ); - } - return $modes; -} - -/** * Implements hook_field_extra_fields(). */ function user_field_extra_fields($bundle) { @@ -2129,15 +2121,15 @@ function _user_cancel($edit, $account, $method) { * * @param $account * A user object. - * @param $build_mode - * Build mode, e.g. 'full'. + * @param $view_mode + * View mode, e.g. 'full'. * * @return * An array as expected by drupal_render(). */ -function user_view($account, $build_mode = 'full') { +function user_view($account, $view_mode = 'full') { // Retrieve all profile fields and attach to $account->content. - user_build_content($account, $build_mode); + user_build_content($account, $view_mode); $build = $account->content; // We don't need duplicate rendering info in account->content. @@ -2146,7 +2138,7 @@ function user_view($account, $build_mode = 'full') { $build += array( '#theme' => 'user_profile', '#account' => $account, - '#build_mode' => $build_mode, + '#view_mode' => $view_mode, ); // Allow modules to modify the structured user. @@ -2160,19 +2152,19 @@ function user_view($account, $build_mode = 'full') { * * @param $account * A user object. - * @param $build_mode - * Build mode, e.g. 'full'. + * @param $view_mode + * View mode, e.g. 'full'. */ -function user_build_content($account, $build_mode = 'full') { +function user_build_content($account, $view_mode = 'full') { // Remove previously built content, if exists. $account->content = array(); // Build fields content. - field_attach_prepare_view('user', array($account->uid => $account), $build_mode); - $account->content += field_attach_view('user', $account, $build_mode); + field_attach_prepare_view('user', array($account->uid => $account), $view_mode); + $account->content += field_attach_view('user', $account, $view_mode); // Populate $account->content with a render() array. - module_invoke_all('user_view', $account, $build_mode); + module_invoke_all('user_view', $account, $view_mode); } /** |