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

9 files changed, 10 insertions, 10 deletions

diff --git a/pages/avatar/edit.php b/pages/avatar/edit.php
index 5e44eb4b0..eef8f8f8b 100644
--- a/pages/avatar/edit.php
+++ b/pages/avatar/edit.php
@@ -10,8 +10,8 @@ elgg_set_context('profile_edit');
 
 $title = elgg_echo('avatar:edit');
 
-$content = elgg_view('core/avatar/upload', array('entity' => elgg_get_page_owner()));
-$content .= elgg_view('core/avatar/crop', array('entity' => elgg_get_page_owner()));
+$content = elgg_view('core/avatar/upload', array('entity' => elgg_get_page_owner_entity()));
+$content .= elgg_view('core/avatar/crop', array('entity' => elgg_get_page_owner_entity()));
 
 $params = array(
 	'content' => $content,
diff --git a/pages/avatar/view.php b/pages/avatar/view.php
index 8b420c61a..55ae00e16 100644
--- a/pages/avatar/view.php
+++ b/pages/avatar/view.php
@@ -3,7 +3,7 @@
  * View an avatar
  */
 
-$user = elgg_get_page_owner();
+$user = elgg_get_page_owner_entity();
 
 // Get the size
 $size = strtolower(get_input('size'));
diff --git a/pages/friends/index.php b/pages/friends/index.php
index a8e5f7e8e..84c0fa526 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$owner = elgg_get_page_owner();
+$owner = elgg_get_page_owner_entity();
 if (!$owner) {
 	// unknown user so send away (@todo some sort of 404 error)
 	forward();
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 395334ff5..7091c4445 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$owner = elgg_get_page_owner();
+$owner = elgg_get_page_owner_entity();
 if (!$owner) {
 	// unknown user so send away (@todo some sort of 404 error)
 	forward();
diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
index 1ca29ede9..4659ea150 100644
--- a/pages/friends/pickercallback.php
+++ b/pages/friends/pickercallback.php
@@ -23,7 +23,7 @@ if (!$members) {
 $friendspicker = (int) get_input('friendspicker', 0);
 
 // Get page owner (bomb out if there isn't one)
-$pageowner = elgg_get_page_owner();
+$pageowner = elgg_get_page_owner_entity();
 if (!$pageowner) {
 	forward();
 	exit;
diff --git a/pages/profile/edit.php b/pages/profile/edit.php
index 64ffd7dc5..0ffb8783f 100644
--- a/pages/profile/edit.php
+++ b/pages/profile/edit.php
@@ -5,7 +5,7 @@
 
 gatekeeper();
 
-$user = elgg_get_page_owner();
+$user = elgg_get_page_owner_entity();
 if (!$user) {
 	register_error(elgg_echo("profile:notfound"));
 	forward();
diff --git a/pages/settings/account.php b/pages/settings/account.php
index 88e916658..2d3edd695 100644
--- a/pages/settings/account.php
+++ b/pages/settings/account.php
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
+if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
 	set_page_owner(get_loggedin_userid());
 }
 
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 2c9c32190..5cb935e07 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
+if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
 	set_page_owner(get_loggedin_userid());
 }
 
diff --git a/pages/settings/tools.php b/pages/settings/tools.php
index e1c247581..ec0786c17 100644
--- a/pages/settings/tools.php
+++ b/pages/settings/tools.php
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
+if ((!elgg_get_page_owner_entity()) || (!elgg_get_page_owner_entity()->canEdit())) {
 	set_page_owner(get_loggedin_userid());
 }