diff options
Diffstat (limited to 'views/default')
| -rw-r--r-- | views/default/core/settings/account/default_access.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/email.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/language.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/name.php | 2 | ||||
| -rw-r--r-- | views/default/core/settings/account/password.php | 2 | ||||
| -rw-r--r-- | views/default/js/initialize_elgg.php | 2 | ||||
| -rw-r--r-- | views/default/layout/elements/owner_block.php | 2 | ||||
| -rw-r--r-- | views/default/layout/shells/content/header.php | 2 | ||||
| -rw-r--r-- | views/default/layout/shells/widgets.php | 2 | ||||
| -rw-r--r-- | views/default/page/elements/content_header.php | 2 | ||||
| -rw-r--r-- | views/default/page/elements/content_header_member.php | 4 | 
11 files changed, 12 insertions, 12 deletions
| diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php index 3fbf3d32d..678a68ba1 100644 --- a/views/default/core/settings/account/default_access.php +++ b/views/default/core/settings/account/default_access.php @@ -6,7 +6,7 @@   * @subpackage Core   */  if ($vars['config']->allow_user_default_access) { -	$user = elgg_get_page_owner(); +	$user = elgg_get_page_owner_entity();  	if ($user) {  		if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) { diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php index b0d69eb82..1222a46ef 100644 --- a/views/default/core/settings/account/email.php +++ b/views/default/core/settings/account/email.php @@ -6,7 +6,7 @@   * @subpackage Core   */ -$user = elgg_get_page_owner(); +$user = elgg_get_page_owner_entity();  if ($user) {  ?> diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php index 45d121c15..bac22fe34 100644 --- a/views/default/core/settings/account/language.php +++ b/views/default/core/settings/account/language.php @@ -7,7 +7,7 @@   */  global $CONFIG; -$user = elgg_get_page_owner(); +$user = elgg_get_page_owner_entity();  if ($user) {  ?> diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php index fad6c488f..22f950925 100644 --- a/views/default/core/settings/account/name.php +++ b/views/default/core/settings/account/name.php @@ -8,7 +8,7 @@   */ -$user = elgg_get_page_owner(); +$user = elgg_get_page_owner_entity();  // all hidden, but necessary for properly updating user details  echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name)); diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php index 8e200754e..524cc0ce0 100644 --- a/views/default/core/settings/account/password.php +++ b/views/default/core/settings/account/password.php @@ -6,7 +6,7 @@   * @subpackage Core   */ -$user = elgg_get_page_owner(); +$user = elgg_get_page_owner_entity();  if ($user) {  ?> diff --git a/views/default/js/initialize_elgg.php b/views/default/js/initialize_elgg.php index 03d5adc5a..7634851f5 100644 --- a/views/default/js/initialize_elgg.php +++ b/views/default/js/initialize_elgg.php @@ -14,7 +14,7 @@ elgg.security.token.__elgg_ts = <?php echo $ts = time(); ?>;  elgg.security.token.__elgg_token = '<?php echo generate_action_token($ts); ?>';  <?php -$page_owner = elgg_get_page_owner(); +$page_owner = elgg_get_page_owner_entity();  if ($page_owner instanceof ElggEntity) {  	$page_owner_json = array(); diff --git a/views/default/layout/elements/owner_block.php b/views/default/layout/elements/owner_block.php index 862b0b5a6..6ec4ebabe 100644 --- a/views/default/layout/elements/owner_block.php +++ b/views/default/layout/elements/owner_block.php @@ -11,7 +11,7 @@  elgg_push_context('owner_block');  // groups and other users get owner block -$owner = elgg_get_page_owner(); +$owner = elgg_get_page_owner_entity();  if ($owner instanceof ElggGroup ||  	($owner instanceof ElggUser && $owner->getGUID() != get_loggedin_userid())) { diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php index 029794408..2b2d748a8 100644 --- a/views/default/layout/shells/content/header.php +++ b/views/default/layout/shells/content/header.php @@ -26,7 +26,7 @@ if ($context) {  		$buttons = $vars['buttons'];  	} else {  		if (isloggedin() && $context) { -			$owner = elgg_get_page_owner(); +			$owner = elgg_get_page_owner_entity();  			if (elgg_instanceof($owner, 'group')) {  				$guid = $owner->getGUID();  			} else { diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php index f47c90f03..f6df67681 100644 --- a/views/default/layout/shells/widgets.php +++ b/views/default/layout/shells/widgets.php @@ -15,7 +15,7 @@ $show_add_widgets = elgg_get_array_value('show_add_widgets', $vars, true);  $exact_match = elgg_get_array_value('exact_match', $vars, false);  $show_access = elgg_get_array_value('show_access', $vars, true); -$owner = elgg_get_page_owner(); +$owner = elgg_get_page_owner_entity();  $context = elgg_get_context();  elgg_push_context('widgets'); diff --git a/views/default/page/elements/content_header.php b/views/default/page/elements/content_header.php index 8c0e01c57..6383c2f18 100644 --- a/views/default/page/elements/content_header.php +++ b/views/default/page/elements/content_header.php @@ -17,7 +17,7 @@   * @subpackage Core   */ -$page_owner = elgg_get_page_owner(); +$page_owner = elgg_get_page_owner_entity();  $logged_in_user = get_loggedin_user();  $username = $logged_in_user->username; diff --git a/views/default/page/elements/content_header_member.php b/views/default/page/elements/content_header_member.php index 3d8fff0c0..4f21cbcce 100644 --- a/views/default/page/elements/content_header_member.php +++ b/views/default/page/elements/content_header_member.php @@ -8,8 +8,8 @@   *   */ -$page_owner = elgg_get_page_owner(); -$name = elgg_get_page_owner()->name; +$page_owner = elgg_get_page_owner_entity(); +$name = elgg_get_page_owner_entity()->name;  // get the object type  $type = $vars['type']; | 
