Refs #1439: Using new page_owner functions in all of core

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

10 files changed, 14 insertions, 14 deletions

diff --git a/mod/file/edit.php b/mod/file/edit.php
index 6c7dbd092..8d091caa0 100644
--- a/mod/file/edit.php
+++ b/mod/file/edit.php
@@ -18,7 +18,7 @@ if (!$file) {
 }
 
 // Set the page owner
-$page_owner = page_owner_entity();
+$page_owner = elgg_get_page_owner();
 if (!$page_owner) {
 	$container_guid = $file->container_guid;
 	if ($container_guid) {
diff --git a/mod/file/friends.php b/mod/file/friends.php
index d7d47acf7..984aedc60 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -11,7 +11,7 @@
 		group_gatekeeper();
 	}
 	
-	$owner = page_owner_entity();
+	$owner = elgg_get_page_owner();
 	
 	$title = sprintf(elgg_echo("file:friends"),$owner->name);
 	$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));	
diff --git a/mod/file/index.php b/mod/file/index.php
index 9c2745f1b..28ec07031 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -14,20 +14,20 @@
 	group_gatekeeper();
 	
 	//set the title
-	if (page_owner() == get_loggedin_userid()) {
+	if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
 		$title = elgg_echo('file:yours');
 		$area1 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
 	} else {
-		$title = sprintf(elgg_echo("file:user"),page_owner_entity()->name);
+		$title = sprintf(elgg_echo("file:user"),elgg_get_page_owner()->name);
 		$area1 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
 	}
 		
 	// Get objects
 	set_context('search');
 	$offset = (int)get_input('offset', 0);
-	$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => page_owner(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE));
+	$area2 .= elgg_list_entities(array('types' => 'object', 'subtypes' => 'file', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => 10, 'offset' => $offset, 'full_view' => FALSE));
 	set_context('file');
-	$get_filter = get_filetype_cloud(page_owner());
+	$get_filter = get_filetype_cloud(elgg_get_page_owner_guid());
 	if ($get_filter) {
 		$area1 .= $get_filter;
 	} else {
diff --git a/mod/file/search.php b/mod/file/search.php
index 1b646f361..9279129a8 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -53,8 +53,8 @@
 			if (is_array($owner_guid)) {
 				//$area2 = elgg_view_title(elgg_echo("file:friends:type:" . $tag));
 				$area2 = elgg_view('page_elements/content_header', array('context' => "friends", 'type' => 'file'));
-			} else if (page_owner() && page_owner() != $_SESSION['guid']) {
-				//$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),page_owner_entity()->name));
+			} else if (elgg_get_page_owner_guid() && elgg_get_page_owner_guid() != $_SESSION['guid']) {
+				//$area2 = elgg_view_title(sprintf(elgg_echo("file:user:type:" . $tag),elgg_get_page_owner()->name));
 				$area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'file'));
 			} else{
 				//$area2 = elgg_view_title(elgg_echo("file:type:" . $tag));
diff --git a/mod/file/start.php b/mod/file/start.php
index 1910b26b8..60e863df5 100644
--- a/mod/file/start.php
+++ b/mod/file/start.php
@@ -74,7 +74,7 @@
 		
 		global $CONFIG;
 		
-		$page_owner = page_owner_entity();
+		$page_owner = elgg_get_page_owner();
 		
 		// Group submenu option	
 			if ($page_owner instanceof ElggGroup && get_context() == "groups") {
diff --git a/mod/file/upload.php b/mod/file/upload.php
index 6f9d3d750..a4cd4e01e 100644
--- a/mod/file/upload.php
+++ b/mod/file/upload.php
@@ -14,7 +14,7 @@
 
 	// Render the file upload page
 
-	$container_guid = page_owner();
+	$container_guid = elgg_get_page_owner_guid();
 	$area1 = elgg_view_title($title = elgg_echo('file:upload'));
 	$area1 .= elgg_view("file/upload", array('container_guid' => $container_guid));
 	$body = elgg_view_layout('one_column_with_sidebar', $area1);
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 312a5c5cf..f520f0d2e 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -41,7 +41,7 @@
 
 
         //get a link to the users files
-        $users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username;
+        $users_file_url = $vars['url'] . "pg/file/" . elgg_get_page_owner()->username;
 
         echo "<p><a href=\"{$users_file_url}\">" . elgg_echo('file:more') . "</a></p>";
 
diff --git a/mod/file/views/default/file/typecloud.php b/mod/file/views/default/file/typecloud.php
index 5ac831cfe..e404327ae 100644
--- a/mod/file/views/default/file/typecloud.php
+++ b/mod/file/views/default/file/typecloud.php
@@ -37,7 +37,7 @@
 		if ($tag == "image")
 			$url .= "&search_viewtype=gallery";
 		
-		$url .= "&page_owner=" . page_owner();
+		$url .= "&page_owner=" . elgg_get_page_owner_guid();
 			
 		$inputtag = get_input('tag');
 		if ($inputtag == $tag || (empty($inputtag) && $tag == "all")) {
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
index 0a94589e5..f89cf86d3 100644
--- a/mod/file/views/default/file/upload.php
+++ b/mod/file/views/default/file/upload.php
@@ -27,7 +27,7 @@
 			$access_id = 0;
 		}
 		$access_id = isset($_SESSION['uploadaccessid']) ? $_SESSION['uploadaccessid'] : $access_id;
-		$container_guid = page_owner_entity()->guid;
+		$container_guid = elgg_get_page_owner_guid();
 	}
 		
 	// make sure session cache is cleared
diff --git a/mod/file/world.php b/mod/file/world.php
index 21e741184..2bc24bd66 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -11,7 +11,7 @@
 	$offset = get_input("offset", 0);
 	
 	// Get the current page's owner
-		$page_owner = page_owner_entity();
+		$page_owner = elgg_get_page_owner();
 		if ($page_owner === false || is_null($page_owner)) {
 			$page_owner = get_loggedin_user();
 			set_page_owner($_SESSION['guid']);