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

6 files changed, 9 insertions, 9 deletions

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(