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

15 files changed, 20 insertions, 20 deletions

diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index 9081dbe8d..38d94fa4e 100644
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -7,7 +7,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 

 $group_guid = (int)get_input('group');

 set_page_owner($group_guid);

-if (!(page_owner_entity() instanceof ElggGroup)) {

+if (!(elgg_get_page_owner() instanceof ElggGroup)) {

 	forward();

 }

 group_gatekeeper();

@@ -50,7 +50,7 @@ if (count($entity_guids) > 0) {
 $area1 .= elgg_view_title(elgg_echo('groups:activity'));

 $area1 .= elgg_view("group_activity/extend");

 $area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";

-$title = sprintf(elgg_echo("groups:activity"), page_owner_entity()->name);

+$title = sprintf(elgg_echo("groups:activity"), elgg_get_page_owner()->name);

 $body = elgg_view_layout('one_column_with_sidebar', $area1);

 

 // Finally draw the page

diff --git a/mod/groups/addtopic.php b/mod/groups/addtopic.php
index cc02fa4eb..8d62bf19f 100644
--- a/mod/groups/addtopic.php
+++ b/mod/groups/addtopic.php
@@ -10,7 +10,7 @@ group_gatekeeper();
 		
 $page_owner = set_page_owner((int) get_input('group_guid'));
 		
-if (!(page_owner_entity() instanceof ElggGroup)) forward();
+if (!(elgg_get_page_owner() instanceof ElggGroup)) forward();
 		
 // sort the display
 $area2 = elgg_view("forms/forums/addtopic");
diff --git a/mod/groups/all.php b/mod/groups/all.php
index dda000f95..c51097910 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -54,7 +54,7 @@
 
 	$objects = "<div class='group_listings'>".$objects."</div>";
 
-	$title = sprintf(elgg_echo("groups:all"), page_owner_entity()->name);
+	$title = sprintf(elgg_echo("groups:all"), elgg_get_page_owner()->name);
 	if(isloggedin()){
 		$area1 .= elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "{$CONFIG->url}pg/groups/new"));
 	}
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
index b09efacbe..2c457f53b 100644
--- a/mod/groups/edittopic.php
+++ b/mod/groups/edittopic.php
@@ -12,7 +12,7 @@ get_input('group');
 $page_owner = set_page_owner((int)get_input('group'));
 	
 // check the user is a member of the group
-if (!(page_owner_entity() instanceof ElggGroup)) forward();
+if (!(elgg_get_page_owner() instanceof ElggGroup)) forward();
 	
 //get the topic
 $topic = get_entity((int) get_input('topic'));
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index c06bb2ebb..a6b88f9fb 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -7,7 +7,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 $group_guid = (int)get_input('group_guid');
 set_page_owner($group_guid);
-if (!(page_owner_entity() instanceof ElggGroup)) {
+if (!(elgg_get_page_owner() instanceof ElggGroup)) {
 	forward();
 }
 
diff --git a/mod/groups/index.php b/mod/groups/index.php
index a06c67f73..398996072 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -16,7 +16,7 @@
 	$area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "{$CONFIG->url}pg/groups/new"));
 	
 	set_context('search');
-	$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
+	$objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
 	set_context('groups');
 	
 	$area1 .= $objects;
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index 0085033fa..b479018ca 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -14,7 +14,7 @@
 	$limit = get_input("limit", 10);
 	$offset = get_input("offset", 0);
 	
-	if (page_owner() == get_loggedin_userid()) {
+	if (elgg_get_page_owner_guid() == get_loggedin_userid()) {
 		$title = elgg_echo("groups:yours");
 	} else $title = elgg_echo("groups:owned");
 
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 689e24863..b81ae81ce 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -200,7 +200,7 @@
 		global $CONFIG;
 
 		// Get the page owner entity
-		$page_owner = page_owner_entity();
+		$page_owner = elgg_get_page_owner();
 
 		if (get_context() == 'groups') {
 			if ($page_owner instanceof ElggGroup) {
@@ -399,7 +399,7 @@
 	 */
 	function groups_write_acl_plugin_hook($hook, $entity_type, $returnvalue, $params)
 	{
-		$page_owner = page_owner_entity();
+		$page_owner = elgg_get_page_owner();
 		if (!$loggedin = get_loggedin_user()) {
 			return $returnvalue;
 		}
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
index afd916ad2..d3ba05ead 100644
--- a/mod/groups/topicposts.php
+++ b/mod/groups/topicposts.php
@@ -15,7 +15,7 @@
 		
 	//get_input('group_guid');
 		set_page_owner(get_input('group_guid'));
-		if (!(page_owner_entity() instanceof ElggGroup)) forward();
+		if (!(elgg_get_page_owner() instanceof ElggGroup)) forward();
 		
 		group_gatekeeper();
 		
diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php
index 3eb124395..03e628846 100644
--- a/mod/groups/views/default/forum/maintopic.php
+++ b/mod/groups/views/default/forum/maintopic.php
@@ -23,7 +23,7 @@
 	    // display the user name

 	    echo "<div class='entity_listing_info'>";

 	    // if comment owner, group owner, or site admin - display edit and delete options

-	    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {

+	    if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {

 			echo "<div class='entity_metadata'>";

 	        echo "<span class='delete_button'>".elgg_view("output/confirmlink",array(

 				'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),

diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index d5e533f81..5c1f5a099 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -9,7 +9,7 @@
 		<h2><?php echo elgg_echo("groups:forum"); ?></h2>
 	</div>
 	<?php // only show the add topic button if the user is a member
-		if(page_owner_entity()->isMember(get_loggedin_user())) {
+		if(elgg_get_page_owner()->isMember(get_loggedin_user())) {
 	?>
 		<div class="content_header_options">
 			<a class="action_button" href="<?php echo $vars['url']; ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
diff --git a/mod/groups/views/default/forum/viewposts.php b/mod/groups/views/default/forum/viewposts.php
index f0810ba18..407869314 100644
--- a/mod/groups/views/default/forum/viewposts.php
+++ b/mod/groups/views/default/forum/viewposts.php
@@ -39,7 +39,7 @@ echo elgg_view('navigation/pagination',array(
 		echo "<h3>" . elgg_echo("groups:topicisclosed") . "</h3>";
 		echo "<p>" . elgg_echo("groups:topiccloseddesc") . "</p>";
 
-	}elseif(page_owner_entity()->isMember(get_loggedin_user())){
+	}elseif(elgg_get_page_owner()->isMember(get_loggedin_user())){
 		//comments are on and the user viewing is a member
 		echo elgg_view_comments($vars['entity']);
 	}else{
diff --git a/mod/groups/views/default/groups/activity_latest.php b/mod/groups/views/default/groups/activity_latest.php
index 4947cfc0b..ea16964c3 100644
--- a/mod/groups/views/default/groups/activity_latest.php
+++ b/mod/groups/views/default/groups/activity_latest.php
@@ -5,10 +5,10 @@
  * @package Groups
  */
 ?>
-<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/activity/" . page_owner(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/activity/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
 <h3><?php echo elgg_echo("activity"); ?></h3>
 <?php
-	$owner = page_owner_entity();
+	$owner = elgg_get_page_owner();
 	$group_guid = $owner->guid;
 	$limit = 5;
 
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index 2a9ddaf42..b84a224ab 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -5,7 +5,7 @@
 //check to make sure this group forum has been activated
 if($vars['entity']->forum_enable != 'no'){
 ?>
-<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/forum/" . page_owner(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/groups/forum/" . elgg_get_page_owner_guid(); ?>"><?php echo elgg_echo('link:view:all')?></a></span>
 <h3><?php echo elgg_echo('groups:latestdiscussion'); ?></h3>
 <?php
 	
@@ -23,8 +23,8 @@ if($vars['entity']->forum_enable != 'no'){
     	        echo "</div>";
         }
     } else {
-	    if(page_owner_entity()->isMember(get_loggedin_user())){
-			$create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . page_owner();
+	    if(elgg_get_page_owner()->isMember(get_loggedin_user())){
+			$create_discussion = $vars['url'] . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid();
 			echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
 		}else{
 			echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index 74a66c6d7..2fdf24723 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -49,7 +49,7 @@ if (get_context() == "search") {
 	}
     $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"{$vars['url']}mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 
-    if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {
+    if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
         	// display the delete link to those allowed to delete
           	$info .= "<div class='entity_metadata'>";
 			$info .= '<span class="entity_edit">' . elgg_view("output/url", array(