changed elgg_get_page_owner() to elgg_get_page_owner_entity() to be more consistent

git-svn-id: http://code.elgg.org/elgg/trunk@7943 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 11 insertions, 11 deletions

diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index 7a0c88a8d..8f97905f9 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 gatekeeper();
 		
 // Get the current page's owner
-$page_owner = elgg_get_page_owner();
+$page_owner = elgg_get_page_owner_entity();
 if ($page_owner === false || is_null($page_owner) && (get_loggedin_user())) {
 	$page_owner = get_loggedin_user();
 	set_page_owner($page_owner->getGUID());
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 8550878b6..bed077864 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -56,7 +56,7 @@ function bookmarks_init() {
 function bookmarks_pagesetup() {
 	global $CONFIG;
 
-	$page_owner = elgg_get_page_owner();
+	$page_owner = elgg_get_page_owner_entity();
 
 	// Add group bookmark menu item
 	if (isloggedin()) {
@@ -110,7 +110,7 @@ function bookmarks_page_handler($page) {
 			'sidebar' => $sidebar,
 		);
 		$body = elgg_view_layout('one_column_with_sidebar', $params);
-		echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner()->name)), $body);
+		echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner_entity()->name)), $body);
 
 		return FALSE;
 	}
@@ -258,7 +258,7 @@ function bookmarks_page_handler($page) {
 		'sidebar' => $sidebar,
 	);
 	$body = elgg_view_layout('two_sidebar', $params);
-	echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner()->name)), $body);
+	echo elgg_view_page(elgg_echo("bookmarks:user", array(elgg_get_page_owner_entity()->name)), $body);
 
 	return TRUE;
 }
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 1e11ed1ca..75d3686b9 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -5,7 +5,7 @@
  * @package ElggBookmarks
  */
 
-$page_owner = elgg_get_page_owner();
+$page_owner = elgg_get_page_owner_entity();
 $bookmarktext = elgg_echo("bookmarks:this");
 
 if ($page_owner instanceof ElggGroup) {
diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
index 7273836e2..12cd76ba7 100644
--- a/mod/bookmarks/views/default/bookmarks/form.php
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -25,9 +25,9 @@ if(isset($vars['entity'])){
 	if ($address == "previous")
 		$address = $_SERVER['HTTP_REFERER'];
 	$tags = array();
-	if(elgg_get_page_owner() instanceof ElggGroup){
+	if(elgg_get_page_owner_entity() instanceof ElggGroup){
 		//if in a group, set the access level to default to the group
-		$access_id = elgg_get_page_owner()->group_acl;
+		$access_id = elgg_get_page_owner_entity()->group_acl;
 	}else{
 		$access_id = get_default_access(get_loggedin_user());
 	}
@@ -89,7 +89,7 @@ if(isset($vars['entity'])){
 			<?php 	echo elgg_echo('access'); ?>
 			<?php
 					//if it is a group, pull out the group access view
-					if(elgg_get_page_owner() instanceof ElggGroup){
+					if(elgg_get_page_owner_entity() instanceof ElggGroup){
 						$access_options = group_access_options($owner);
 						echo elgg_view('input/access', array('internalname' => 'access', 
 																		'value' => $access_id, 
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
index 50d4dbdb2..dd1b6aa9c 100755
--- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -5,7 +5,7 @@ $bookmarks = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks
 			'container_guids' => elgg_get_page_owner_guid(), 'limit' => 6));
 ?>
 <div class="group_tool_widget bookmarks">
-<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username; ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner_entity()->username; ?>"><?php echo elgg_echo('link:view:all')?></a></span>
 <h3><?php echo elgg_echo('bookmarks:group') ?></h3>
 <?php	
 if($bookmarks){
@@ -29,7 +29,7 @@ if($bookmarks){
 		echo "<div class='entity-listing clearfix'>" . $info . "</div>";
 	} 
 } else {
-	$create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add";
+	$create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner_entity()->username . "/add";
 	echo "<p class='margin-top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
 }
 echo "</div>";
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
index 34b9ff834..6babbcd20 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -49,7 +49,7 @@ if ($bookmarks) {
 	}
 
 	if ($num_bookmarks > $num) {
-		$user_inbox = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username;
+		$user_inbox = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner_entity()->username;
 		echo "<div class='ContentWrapper bookmarks more'><a href=\"{$user_inbox}\">" . elgg_echo('bookmarks:read') . "</a></div>";
 	}
 } else {