]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Refs #1439: Using new page_owner functions in all of core
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 30 Oct 2010 21:48:24 +0000 (21:48 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 30 Oct 2010 21:48:24 +0000 (21:48 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7140 36083f99-b078-4883-b0ff-0f9b5a30f544

89 files changed:
engine/lib/group.php
engine/lib/users.php
engine/lib/views.php
mod/blog/views/default/blog/sidebar_menu.php
mod/bookmarks/bookmarklet.php
mod/bookmarks/start.php
mod/bookmarks/views/default/bookmarks/bookmarklet.php
mod/bookmarks/views/default/bookmarks/form.php
mod/bookmarks/views/default/bookmarks/group_bookmarks.php
mod/bookmarks/views/default/widgets/bookmarks/view.php
mod/defaultwidgets/views/default/defaultwidgets/editor.php
mod/file/edit.php
mod/file/friends.php
mod/file/index.php
mod/file/search.php
mod/file/start.php
mod/file/upload.php
mod/file/views/default/file/groupprofile_files.php
mod/file/views/default/file/typecloud.php
mod/file/views/default/file/upload.php
mod/file/world.php
mod/groups/activity.php
mod/groups/addtopic.php
mod/groups/all.php
mod/groups/edittopic.php
mod/groups/forum.php
mod/groups/index.php
mod/groups/membership.php
mod/groups/start.php
mod/groups/topicposts.php
mod/groups/views/default/forum/maintopic.php
mod/groups/views/default/forum/topics.php
mod/groups/views/default/forum/viewposts.php
mod/groups/views/default/groups/activity_latest.php
mod/groups/views/default/groups/forum_latest.php
mod/groups/views/default/object/groupforumtopic.php
mod/members/index.php
mod/messageboard/index.php
mod/messageboard/views/default/messageboard/forms/add.php
mod/messageboard/views/default/widgets/messageboard/view.php
mod/messages/send.php
mod/pages/edit.php
mod/pages/history.php
mod/pages/index.php
mod/pages/new.php
mod/pages/start.php
mod/pages/view.php
mod/pages/views/default/forms/pages/edit.php
mod/pages/views/default/pages/groupprofile_pages.php
mod/pages/views/default/widgets/pages/view.php
mod/pages/welcome.php
mod/pages/world.php
mod/profile/edit.php
mod/profile/editicon.php
mod/profile/icon.php
mod/profile/start.php
mod/profile/views/default/profile/admin_menu.php
mod/profile/views/default/profile/commentwall/commentwalladd.php
mod/profile/views/default/profile/edit.php
mod/profile/views/default/profile/listing.php
mod/profile/views/default/profile/metatags.php
mod/profile/views/default/profile/profile_contents/details.php
mod/profile/views/default/profile/profile_ownerblock.php
mod/reportedcontent/add.php
mod/tagcloud/views/default/widgets/tagcloud/view.php
mod/thewire/index.php
mod/thewire/start.php
mod/thewire/views/default/widgets/thewire/view.php
pages/friends/index.php
pages/friends/of.php
pages/friends/pickercallback.php
pages/settings/index.php
pages/settings/plugins.php
pages/settings/statistics.php
pages/settings/user.php
views/default/canvas/layouts/widgets.php
views/default/notifications/settings/usersettings.php
views/default/page_elements/content_header.php
views/default/page_elements/content_header_member.php
views/default/page_elements/owner_block.php
views/default/page_elements/title.php
views/default/user/settings/default_access.php
views/default/user/settings/email.php
views/default/user/settings/language.php
views/default/user/settings/name.php
views/default/user/settings/password.php
views/default/widgets/editwrapper.php
views/default/widgets/wrapper.php
views/foaf/page_shells/default.php

index 8c68e0aca4daa7eac214a5c311f20cf380509189..ed7aa504a4d113509df0142e3292e27d02a6255a 100644 (file)
@@ -201,7 +201,7 @@ $order_by = "", $limit = 10, $offset = 0, $count = FALSE) {
 
        $container_guid = (int)$group_guid;
        if ($container_guid == 0) {
-               $container_guid = page_owner();
+               $container_guid = elgg_get_page_owner_guid();
        }
 
        $where = array();
@@ -309,7 +309,7 @@ $order_by = "", $site_guid = 0, $count = false) {
 
        $container_guid = (int)$group_guid;
        if ($container_guid == 0) {
-               $container_guid = page_owner();
+               $container_guid = elgg_get_page_owner_guid();
        }
 
        $where = array();
@@ -583,7 +583,7 @@ function group_gatekeeper($forward = true) {
        $allowed = true;
        $url = '';
 
-       if ($group = page_owner_entity()) {
+       if ($group = elgg_get_page_owner()) {
                if ($group instanceof ElggGroup) {
                        $url = $group->getURL();
                        if (
index e980ee6f8cba35e93d0851b5a096cbe3c56ba8b2..6c6e51d4d4b61832d92ec70dca424329f9f1dbd0 100644 (file)
@@ -1243,7 +1243,7 @@ function friends_page_handler($page_elements) {
        if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) {
                set_page_owner($user->getGUID());
        }
-       if (get_loggedin_userid() == page_owner()) {
+       if (get_loggedin_userid() == elgg_get_page_owner_guid()) {
                // disabled for now as we no longer use friends collections (replaced by shared access)
                // collections_submenu_items();
        }
@@ -1261,7 +1261,7 @@ function friends_of_page_handler($page_elements) {
        if (isset($page_elements[0]) && $user = get_user_by_username($page_elements[0])) {
                set_page_owner($user->getGUID());
        }
-       if (get_loggedin_userid() == page_owner()) {
+       if (get_loggedin_userid() == elgg_get_page_owner_guid()) {
                // disabled for now as we no longer use friends collections (replaced by shared access)
                // collections_submenu_items();
        }
@@ -1284,7 +1284,7 @@ function collections_page_handler($page_elements) {
                } else {
                        if ($user = get_user_by_username($page_elements[0])) {
                                set_page_owner($user->getGUID());
-                               if (get_loggedin_userid() == page_owner()) {
+                               if (get_loggedin_userid() == elgg_get_page_owner_guid()) {
                                        collections_submenu_items();
                                }
                                require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/collections.php");
@@ -1401,10 +1401,10 @@ function users_pagesetup() {
                // || get_context() == "collections") { - disabled as we no longer use collections
 
                add_submenu_item(elgg_echo('friends'), $CONFIG->wwwroot . "pg/friends/"
-                       . page_owner_entity()->username);
+                       . elgg_get_page_owner()->username);
 
                add_submenu_item(elgg_echo('friends:of'), $CONFIG->wwwroot . "pg/friendsof/"
-                       . page_owner_entity()->username);
+                       . elgg_get_page_owner()->username);
 
                if (is_plugin_enabled('members')) {
                        add_submenu_item(elgg_echo('members:browse'), $CONFIG->wwwroot . "mod/members/index.php");
index 755fa9da2eb45e04d1e612dbc1a4c1edbfe3fb21..d8564c5e382854c39faa905f73550832c0919fbe 100644 (file)
@@ -283,7 +283,7 @@ function elgg_view($view, $vars = array(), $bypass = false, $debug = false, $vie
 
        // Load page owner variables into $vars
        if (is_callable('page_owner')) {
-               $vars['page_owner'] = page_owner();
+               $vars['page_owner'] = elgg_get_page_owner_guid();
        } else {
                $vars['page_owner'] = -1;
        }
index ffa8d1bd43ca2fd724bcd6a204142c9d8cc06fbf..ab00433c848006c50bb93372e7d7c62d1808e88b 100644 (file)
@@ -22,7 +22,7 @@ Owned blogs;
 */
 
 $loggedin_user = get_loggedin_user();
-$page_owner = page_owner_entity();
+$page_owner = elgg_get_page_owner();
 
 // include a view for plugins to extend
 echo elgg_view("blogs/sidebar", array("object_type" => 'blog'));
@@ -46,7 +46,7 @@ if ($page_owner) {
                        $timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4));
 
                        if (!isset($page_owner)) {
-                               $page_owner = page_owner_entity();
+                               $page_owner = elgg_get_page_owner();
                        }
 
                        $link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
index e1ff3c6dfe0e0a0c9631740195ed5ee231efb626..ecfe61ae52fbf5b932d5810b48058d2556213164 100644 (file)
@@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 gatekeeper();
                
 // 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) && (get_loggedin_user())) {
        $page_owner = get_loggedin_user();
        set_page_owner($page_owner->getGUID());
index 3d748fabeeb5773f3e9e37a6c58083f96d67e1e8..25b87b6c7e5b99630ac416ef1843560be7172794 100644 (file)
@@ -53,7 +53,7 @@ function bookmarks_init() {
 function bookmarks_pagesetup() {
        global $CONFIG;
 
-       $page_owner = page_owner_entity();
+       $page_owner = elgg_get_page_owner();
 
        // Add group bookmark menu item
        if (isloggedin()) {
@@ -79,13 +79,13 @@ function bookmarks_page_handler($page) {
 
        // The first component of a bookmarks URL is the username
        // If the username is set_input()'d and has group:NN in it, magic happens
-       // and the page_owner_entity() is the group.
+       // and the elgg_get_page_owner() is the group.
        if (isset($page[0])) {
                $owner_name = $page[0];
                set_input('username', $owner_name);
 
                // grab the page owner here so the group magic works.
-               $owner = page_owner_entity();
+               $owner = elgg_get_page_owner();
        } else {
                set_page_owner(get_loggedin_userid());
        }
@@ -96,7 +96,7 @@ function bookmarks_page_handler($page) {
                $content = elgg_echo("bookmarks:unknown_user");
 
                $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-               echo page_draw(sprintf(elgg_echo("bookmarks:user"), page_owner_entity()->name), $body);
+               echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
 
                return FALSE;
        }
@@ -105,7 +105,7 @@ function bookmarks_page_handler($page) {
        $section = (isset($page[1])) ? $page[1] : $section = 'items';
 
        //don't show the all site bookmarks breadcrumb when on the all site bookmarks page
-       if(page_owner() != 0){
+       if(elgg_get_page_owner_guid() != 0){
                elgg_push_breadcrumb(elgg_echo('bookmarks:all'), $CONFIG->wwwroot . 'pg/bookmarks/');
        }
 
@@ -240,7 +240,7 @@ function bookmarks_page_handler($page) {
 
        $content = $header . $content;
        $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-       echo page_draw(sprintf(elgg_echo("bookmarks:user"), page_owner_entity()->name), $body);
+       echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
 
        return TRUE;
 }
index 5205632f214be1a86c5d8b778434a8c1d59d8df9..38ef95152a6c058ab51795e7ca457fea2a0609c8 100644 (file)
@@ -5,7 +5,7 @@
  * @package ElggBookmarks
  */
 
-$page_owner = page_owner_entity();
+$page_owner = elgg_get_page_owner();
 $bookmarktext = elgg_echo("bookmarks:this");
 
 if ($page_owner instanceof ElggGroup) {
index b779116fdce9490114159d827fca6de3d0669bd6..deef1f7af713fb5f2405f12647d5494cffb2f64a 100644 (file)
@@ -25,9 +25,9 @@ if(isset($vars['entity'])){
        if ($address == "previous")
                $address = $_SERVER['HTTP_REFERER'];
        $tags = array();
-       if(page_owner_entity() instanceof ElggGroup){
+       if(elgg_get_page_owner() instanceof ElggGroup){
                //if in a group, set the access level to default to the group
-               $access_id = page_owner_entity()->group_acl;
+               $access_id = elgg_get_page_owner()->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(page_owner_entity() instanceof ElggGroup){
+                                       if(elgg_get_page_owner() instanceof ElggGroup){
                                                $access_options = group_access_options($owner);
                                                echo elgg_view('input/access', array('internalname' => 'access', 
                                                                                                                                                'value' => $access_id, 
index 652743b7b79d50ef2ef143256766647e09ac50d9..b476e8cf28352b02992f8051364b8f36f1bba0e1 100755 (executable)
@@ -2,10 +2,10 @@
                        
 //grab the groups bookmarks 
 $bookmarks = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks', 
-                       'container_guids' => page_owner(), 'limit' => 6));
+                       'container_guids' => elgg_get_page_owner_guid(), 'limit' => 6));
 ?>
 <div class="group_tool_widget bookmarks">
-<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username; ?>"><?php echo elgg_echo('link:view:all')?></a></span>
+<span class="group_widget_link"><a href="<?php echo $vars['url'] . "pg/bookmarks/" . elgg_get_page_owner()->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 clearfloat'>" . $info . "</div>";
        } 
 } else {
-       $create_bookmark = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username . "/add";
+       $create_bookmark = $vars['url'] . "pg/bookmarks/" . elgg_get_page_owner()->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
index 37d4ce3a4685d4ba1439170d96fec501c4699d10..1504ec8b4079bf60680e95fdf3e40e049b1ab21a 100644 (file)
@@ -43,7 +43,7 @@ if($bookmarks){
 
        } 
 
-       $user_inbox = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username;
+       $user_inbox = $vars['url'] . "pg/bookmarks/" . elgg_get_page_owner()->username;
        if (get_entities('object', 'bookmarks', $vars['entity']->container_guid, '', '', '', true) > $num)      
                echo "<div class='ContentWrapper bookmarks more'><a href=\"{$user_inbox}\">".elgg_echo('bookmarks:read')."</a></div>";
 
index bdcbd1f9a0d3f5d1641d46ed8487fe7932977d35..6a3756d13a3373450667e6dc5071157a8783c7e1 100644 (file)
@@ -11,7 +11,7 @@
         **/
 
                // set some defaults
-               $owner = page_owner_entity();
+               $owner = elgg_get_page_owner();
                $context = $vars['context'];
                $area1widgets = false;
                $area2widgets = false;
@@ -261,7 +261,7 @@ $(document).ready(function () {
        echo elgg_view('input/hidden',array('internalname' => '__elgg_ts', 'value' => $vars['ts']));
 ?>
 <input type="hidden" name="context" value="<?php echo $context; ?>" />
-<input type="hidden" name="owner" value="<?php echo page_owner(); ?>" />
+<input type="hidden" name="owner" value="<?php echo elgg_get_page_owner_guid(); ?>" />
 <input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit_button"  />
 
 </form>
index 6c7dbd0924a4343d0db73c80165fd7b56353cb72..8d091caa0849b8dc1353b4e6cb55ff41001902f6 100644 (file)
@@ -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) {
index d7d47acf72814eb727f436582c789290cf69ee32..984aedc606ff83ba2273321d24b5b7fd8c595034 100644 (file)
@@ -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'));    
index 9c2745f1b5999fb7b3f182615ded0944cf4b0bec..28ec07031d0e9c9bc457a1aef80b3c36f470a4e9 100644 (file)
        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 {
index 1b646f361ae16e4a40d2dd0afa11d1a1311b275f..9279129a807800d67f66c2f97e63d6e6ca36c47d 100644 (file)
@@ -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));
index 1910b26b832cfea13e884ea3a1d67249a8ee99e7..60e863df5ab3f6a74f9520690556e6a0c1e0f335 100644 (file)
@@ -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") {
index 6f9d3d7500e8787b5ee22e1e44acbaa4156035a6..a4cd4e01ebe788ab928b2641d36d3518b90572c7 100644 (file)
@@ -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);
index 312a5c5cfdec5f841d3b68f35015e13d247b1d87..f520f0d2e080c82735d7b0baf8c976ef92da973d 100644 (file)
@@ -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>";
 
index 5ac831cfe1119b453af2d010ceec4f2e3a260adb..e404327aed4ebdfabb2b1f67fb03159201449cda 100644 (file)
@@ -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")) {
index 0a94589e5669769f1a293e37142405a48686f57e..f89cf86d371e56a9ed6b2504b2193c28d013f4a0 100644 (file)
@@ -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
index 21e741184fa669be4590b74aaba85c3315e28e9b..2bc24bd66a38e221375f36534aedbed489ca61a5 100644 (file)
@@ -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']);
index 9081dbe8dbf5936853592d72a0677ed3cb8bc1bb..38d94fa4eec6cabfbdc067651041b06b76518106 100644 (file)
@@ -7,7 +7,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 \r
 $group_guid = (int)get_input('group');\r
 set_page_owner($group_guid);\r
-if (!(page_owner_entity() instanceof ElggGroup)) {\r
+if (!(elgg_get_page_owner() instanceof ElggGroup)) {\r
        forward();\r
 }\r
 group_gatekeeper();\r
@@ -50,7 +50,7 @@ if (count($entity_guids) > 0) {
 $area1 .= elgg_view_title(elgg_echo('groups:activity'));\r
 $area1 .= elgg_view("group_activity/extend");\r
 $area1 .= "<div class='group_listings hide_comments'>".$river_items."</div>";\r
-$title = sprintf(elgg_echo("groups:activity"), page_owner_entity()->name);\r
+$title = sprintf(elgg_echo("groups:activity"), elgg_get_page_owner()->name);\r
 $body = elgg_view_layout('one_column_with_sidebar', $area1);\r
 \r
 // Finally draw the page\r
index cc02fa4eb3f599facd8a9beba371a46354f4aac2..8d62bf19fcf1e4bbad2c387954fef4f015deecd5 100644 (file)
@@ -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");
index dda000f95542c1411d3d7863ffc4e646a77674a9..c51097910f43fdb43bd74279ad10c519a4087326 100644 (file)
@@ -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"));
        }
index b09efacbec98ffefec02b60908b5a05187a02b82..2c457f53b45fb17beff968f4b915a1e8ab02169d 100644 (file)
@@ -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'));
index c06bb2ebbbb32a8f82e5a44f088e0034bc4bf054..a6b88f9fb735aa5b47dae434fb3de07d2a7b3b0d 100644 (file)
@@ -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();
 }
 
index a06c67f73686f8778f8acac30d85eb6bd63f3315..3989960720e9a01bf5a0f4758750142a2513ade0 100644 (file)
@@ -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;
index 0085033fa10f83598b86ca5a4c26f72a506b12c1..b479018ca2a85f489fb8ee173229ad5ff9b6b4f2 100644 (file)
@@ -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");
 
index 689e24863ea2fb3e35d62554d72e131543bb3731..b81ae81cef70408dd37c93479f4ccb954a72c325 100644 (file)
                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) {
         */
        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;
                }
index afd916ad2a8d03baf151aad8df45212793d8146b..d3ba05ead8f3bdabdf4c396bf55b6792e2604751 100644 (file)
@@ -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();
                
index 3eb12439591543ee7e1b81d3bf0c0f8c22ac0c45..03e6288461c26e991659dd5df432ac4e87787724 100644 (file)
@@ -23,7 +23,7 @@
            // display the user name\r
            echo "<div class='entity_listing_info'>";\r
            // if comment owner, group owner, or site admin - display edit and delete options\r
-           if (groups_can_edit_discussion($vars['entity'], page_owner_entity()->owner_guid)) {\r
+           if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {\r
                        echo "<div class='entity_metadata'>";\r
                echo "<span class='delete_button'>".elgg_view("output/confirmlink",array(\r
                                'href' => $vars['url'] . "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),\r
index d5e533f8105136031ae5bc86678e207328658066..5c1f5a099cc52ac51cdcf2eb460261b88dd6d457 100644 (file)
@@ -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>
index f0810ba18701ac3d827b583a2732b7f4aae09eb1..407869314f074ddc32b7f0a8c6fa74514cd1e326 100644 (file)
@@ -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{
index 4947cfc0bc371756eb50414333b529060a80c4b6..ea16964c3012d917a4731f2015eaae87dd5b3ba6 100644 (file)
@@ -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;
 
index 2a9ddaf423a91e7321b953ad205c7a11fe7a3aaa..b84a224ab2605d4785056658db4a22df8307f32a 100644 (file)
@@ -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>";
index 74a66c6d7670cd54df63404a4395ecceedf5e1a0..2fdf24723c929332b70c8c37bf7cd7c1b8398d3f 100644 (file)
@@ -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(
index 30d6102e3b5c3fe31726b79079914987539f2fe8..4bcdef0fdef0d5bb0bc2ea7bdf885556bc19b54f 100644 (file)
@@ -8,7 +8,7 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // 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($page_owner->getGUID());
@@ -23,8 +23,8 @@ $filter = get_input("filter", "newest");
 $tag = get_input('tag');
 
 // friends links
-$area1 = "<ul class='submenu page_navigation'><li><a href=\"" . $CONFIG->wwwroot."pg/friends/" . page_owner_entity()->username . "\">". elgg_echo('friends') . "</a></li>";
-$area1 .= "<li><a href=\"" . $CONFIG->wwwroot."pg/friendsof/" . page_owner_entity()->username . "\">". elgg_echo('friends:of') . "</a></li>";
+$area1 = "<ul class='submenu page_navigation'><li><a href=\"" . $CONFIG->wwwroot."pg/friends/" . elgg_get_page_owner()->username . "\">". elgg_echo('friends') . "</a></li>";
+$area1 .= "<li><a href=\"" . $CONFIG->wwwroot."pg/friendsof/" . elgg_get_page_owner()->username . "\">". elgg_echo('friends:of') . "</a></li>";
 $area1 .= "<li class='selected'><a href=\"" . $CONFIG->wwwroot."mod/members/index.php\">". elgg_echo('members:browse') . "</a></li>";
 $area1 .= "</ul>";
 
index 88438bb853b417d3d228b18c3a9861ab206d52cb..ff661ce9ca482f14e54d2882f35bcc0e67d7c354 100644 (file)
@@ -11,7 +11,7 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Get the user who is the owner of the message board
-$entity = get_entity(page_owner());
+$entity = elgg_get_page_owner();
 
 // Get any annotations for their message board
 $contents = $entity->getAnnotations('messageboard', 50, 0, 'desc');
index b26527b06e5a1b0ab0bd7f7d30db0916f96f1b4d..ec61ebee7825f2cff40f03c0449a0523797454e9 100644 (file)
@@ -14,7 +14,7 @@
                <textarea name="message_content" value="" class="input_textarea"></textarea><br />
 
                <!-- the page owner, this will be the profile owner -->
-               <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>"  />
+               <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
 
                <?php echo elgg_view('input/securitytoken'); ?>
 
index dde360961bb1aea31d2ea0f218ae78d138e80df8..223cbc007b841c174c3f0f0b60aecd2392b391df 100644 (file)
@@ -8,7 +8,7 @@
  */
 
 //get the full page owner entity
-$user = get_entity(page_owner());
+$user = elgg_get_page_owner();
 
 //the number of message to display
 $num_display = 5;
@@ -46,7 +46,7 @@ if (isloggedin()) {
        <textarea name="message_content" class="input_textarea"></textarea>
 
        <!-- the page owner, this will be the profile owner -->
-       <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>" class="pageOwner"  />
+       <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>" class="pageOwner"  />
 
        <!-- submit button -->
        <input type="submit" id="postit" value="<?php echo elgg_echo('messageboard:postit'); ?>">
index 0435974ce7afeeab1dca979707ac362be52ee4ce..c0a59b28982b1a09591b02b74b4789aee9438978 100644 (file)
@@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 gatekeeper();
 
 // 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($page_owner->getGUID());
index cc9955bc9b6ecde6ced296179467c4e41c685980..30207a7b99b99297d1da2ae7cc7a4ba5764de43e 100644 (file)
@@ -15,7 +15,7 @@ if ($container = $pages->container_guid) {
        set_page_owner($container);
 }
 
-$page_owner = page_owner_entity();
+$page_owner = elgg_get_page_owner();
 
 if ($page_owner === false || is_null($page_owner)) {
        $page_owner = get_loggedin_user();
index 06e877c426ca73d624a20ad0cfe959f7cfe2c8e9..dfbe3ab5960bd33b5a634c219af9f9527c73bf01 100644 (file)
@@ -25,7 +25,7 @@ $offset = (int)get_input('offset');
 $page_guid = get_input('page_guid');
 $pages = get_entity($page_guid);
 
-add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = $pages->title . ": " . elgg_echo("pages:history");
 $content = elgg_view_title($title);
index 2afae36dfa5732f5b1696a70a1c5cb8f90d3439f..50d11af1d6d2286a273e1378bc05446536d99a6b 100644 (file)
@@ -10,13 +10,13 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 // Add menus
-$owner = page_owner_entity();
+$owner = elgg_get_page_owner();
 if (!($owner instanceof ElggGroup)) {
-               add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+               add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
                add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
 }
        if (($owner instanceof ElggEntity) && (can_write_to_container(0,$owner->guid))){
-               add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . page_owner(), 'pagesactions');
+               add_submenu_item(elgg_echo('pages:new'), $CONFIG->url . "pg/pages/new/?container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
                add_submenu_item(elgg_echo('pages:welcome'), $CONFIG->url . "pg/pages/welcome/" . $owner->username, 'pagesactions');
        }
 
@@ -38,7 +38,7 @@ $context = get_context();
 
 set_context('search');
 
-$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
+$objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE));
 
 set_context($context);
 
index bf26403012133733ae1f281692229edc7cd03a27..2003b183ec7f16c4918ccab8351367cc6f142dd8 100644 (file)
@@ -13,7 +13,7 @@ global $CONFIG;
 if ($container = (int) get_input('container_guid')) {
        set_page_owner($container);
 }
-$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($page_owner->getGUID());
@@ -28,7 +28,7 @@ if(get_input('parent_guid')){
        }
 
        global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = elgg_echo("pages:new");
 $area2 .= elgg_view_title($title);
index 80c1607a248db3c55d0d2bd85fefdf2b95b531e0..3dcacd457ae33ebd97577fb0260b35d64142bf90 100644 (file)
@@ -82,7 +82,7 @@ function pages_submenus() {
 
        global $CONFIG;
 
-       $page_owner = page_owner_entity();
+       $page_owner = elgg_get_page_owner();
 
        // Group submenu option
                if ($page_owner instanceof ElggGroup && get_context() == 'groups') {
@@ -310,8 +310,8 @@ function pages_write_permission_check($hook, $entity_type, $returnvalue, $params
 function pages_container_permission_check($hook, $entity_type, $returnvalue, $params) {
 
        if (get_context() == "pages") {
-               if (page_owner()) {
-                       if (can_write_to_container(get_loggedin_userid(), page_owner())) return true;
+               if (elgg_get_page_owner_guid()) {
+                       if (can_write_to_container(get_loggedin_userid(), elgg_get_page_owner_guid())) return true;
                }
                if ($page_guid = get_input('page_guid',0)) {
                        $entity = get_entity($page_guid);
index 2efcf4f04e2f435806d97b1248b711f1608660d3..24684bff7584123e913d135fbdea9151519cc4ab 100644 (file)
@@ -28,10 +28,10 @@ if ($container) {
 }
 
 global $CONFIG;
-// add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+// add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 if ($pages->canEdit()) {
-       add_submenu_item(elgg_echo('pages:newchild'),"{$CONFIG->wwwroot}pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . page_owner(), 'pagesactions');
+       add_submenu_item(elgg_echo('pages:newchild'),"{$CONFIG->wwwroot}pg/pages/new/?parent_guid={$pages->getGUID()}&container_guid=" . elgg_get_page_owner_guid(), 'pagesactions');
        $delete_url = elgg_add_action_tokens_to_url("{$CONFIG->wwwroot}action/pages/delete?page={$pages->getGUID()}");
        add_submenu_item(elgg_echo('pages:delete'), $delete_url, 'pagesactions', true);
 }
@@ -44,7 +44,7 @@ if ($parent_page = get_entity(get_input("page_guid"))) {
 $title = $pages->title;
 
 // Breadcrumbs
-$body = elgg_view('pages/breadcrumbs', array('page_owner' => page_owner_entity(), 'parent' => $parent));
+$body = elgg_view('pages/breadcrumbs', array('page_owner' => elgg_get_page_owner(), 'parent' => $parent));
 
 $body .= elgg_view_title($pages->title);
 $body .= elgg_view_entity($pages, true);
index bdd721b82e1d4e771d634b93bbd2bcf33eba33c6..0d066bf80e600d4d20cb0956a0d7f88ceaa12cff 100644 (file)
@@ -8,7 +8,7 @@
 $parent_guid = get_input('parent_guid');
 $container_guid = get_input('container_guid');
 if (!$container_guid) {
-       $container_guid = page_owner();
+       $container_guid = elgg_get_page_owner_guid();
 }
 
 $new_page = false;
@@ -86,7 +86,7 @@ if ($container_guid) {
 }
 ?>
        <input type="hidden" name="parent_guid" value="<?php if (!$new_page) echo $vars['entity']->parent_guid; else echo $parent_guid; ?>" />
-       <input type="hidden" name="owner_guid" value="<?php if (!$new_page) echo $vars['entity']->owner_guid; else echo page_owner(); ?>" />
+       <input type="hidden" name="owner_guid" value="<?php if (!$new_page) echo $vars['entity']->owner_guid; else echo elgg_get_page_owner_guid(); ?>" />
        <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
 </p>
 
index 17c1d87ed115fbe50729f1496f29c538efad7a12..8069cdd8b7953c7ef4075a064733e3fdaf585ec4 100644 (file)
@@ -13,7 +13,7 @@ if ($vars['entity']->pages_enable != 'no') {
 <h2><?php echo elgg_echo("pages:groupprofile"); ?></h2>
 <?php
 
-       $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE));
+       $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => 5, 'full_view' => FALSE));
 
        if($objects)
                echo $objects;
index 9d5a89aea6d933e74ebce2373796c38e9a43dc47..d51fd008aa2aedf999a81f13dc92c75ab934a0be 100644 (file)
@@ -17,10 +17,10 @@ if (!$num_display) {
        $num_display = 4;
 }
 
-$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE));
+$pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => elgg_get_page_owner_guid(), 'limit' => $num_display, 'full_view' => FALSE));
 
 if ($pages) {
-       $pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username;
+       $pagesurl = $vars['url'] . "pg/pages/owned/" . elgg_get_page_owner()->username;
        $pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>";
 }
 
index 10628b175b06cec2648f2f0a58672c26d130bebe..759114965f366c57d98a99385fb3ef83152c5b70 100644 (file)
@@ -15,7 +15,7 @@ if ($container = (int) get_input('container_guid')) {
        set_page_owner($container);
 }
 
-$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($page_owner->getGUID());
@@ -24,7 +24,7 @@ if ($page_owner === false || is_null($page_owner)) {
 //get the owners welcome message if it exists
 $welcome_message = elgg_get_entities(array('types' => 'object', 'subtypes' => 'pages_welcome', 'container_guid' => $page_owner->getGUID(), 'limit' => 1));
 global $CONFIG;
-add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 
 $title = elgg_echo("pages:welcome");
 $area2 .= elgg_view_title($title);
index 8a8ede68d7b9fc8cdd0c7d3078757441875ad3de..0b411b8b22f564aeee61b6223931a36668ff562c 100644 (file)
@@ -10,7 +10,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 global $CONFIG;
 
 // 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']);
@@ -21,7 +21,7 @@ if (($page_owner instanceof ElggEntity) && ($page_owner->canWriteToContainer()))
 }
 
 if(isloggedin()) {
-       add_submenu_item(sprintf(elgg_echo("pages:user"), page_owner_entity()->name), $CONFIG->url . "pg/pages/owned/" . page_owner_entity()->username, 'pageslinksgeneral');
+       add_submenu_item(sprintf(elgg_echo("pages:user"), elgg_get_page_owner()->name), $CONFIG->url . "pg/pages/owned/" . elgg_get_page_owner()->username, 'pageslinksgeneral');
 }
 
 add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php", 'pageslinksgeneral');
@@ -29,7 +29,7 @@ add_submenu_item(elgg_echo('pages:all'),$CONFIG->wwwroot."mod/pages/world.php",
 $limit = get_input("limit", 10);
 $offset = get_input("offset", 0);
 
-$title = sprintf(elgg_echo("pages:all"),page_owner_entity()->name);
+$title = sprintf(elgg_echo("pages:all"),elgg_get_page_owner()->name);
 
 // Get objects
 $context = get_context();
index 2b09c7ff8beb03e512f6ed80363ffc2bb2084e96..97b656a5c5d7e23311b01f52af80509924f47e85 100644 (file)
@@ -15,7 +15,7 @@ if (!isloggedin()) {
 }
 
 // Get owner of profile - set in page handler
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 if (!$user) {
        register_error(elgg_echo("profile:notfound"));
        forward();
index 2b1a40d0f37e95f346389c1209050628de40b0cf..9b0a654d209bf14b9718252ee7fb3bceebd75408 100644 (file)
@@ -14,7 +14,7 @@ if (!isloggedin()) {
 }
 
 // Get owner of profile - set in page handler
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 if (!$user) {
        register_error(elgg_echo("profile:notfound"));
        forward();
index b7b4f921cec3832297fb27f90b146bbd8a59365c..48ccc16c251f1833e0bc427cb225765f93dd9b07 100644 (file)
@@ -8,7 +8,7 @@
 require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Get the owning user
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 
 // Get the size
 $size = strtolower(get_input('size'));
index 48547c0bfc607cc652e15c182581deab5c50d430..d1840babbd158a63443874fb8076435d52ee4615 100644 (file)
@@ -174,7 +174,7 @@ function profile_pagesetup()
 
        //add submenu options
        if (get_context() == "profile") {
-               $page_owner = page_owner_entity();
+               $page_owner = elgg_get_page_owner();
                if ($page_owner && $page_owner->canEdit()) {
                        add_submenu_item(elgg_echo('profile:editdetails'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/details");
                        add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . "pg/profile/{$page_owner->username}/edit/icon");
index a339103097db874488faa04f1e81c9525d147fe4..a896a0acef03d1173117dcab045df858f48d74e8 100755 (executable)
@@ -5,8 +5,8 @@
 global $CONFIG;
 
 if (isadminloggedin()){
-       if ($_SESSION['id']!=page_owner()){
-               $user = get_user(page_owner());
+       if ($_SESSION['id']!=elgg_get_page_owner_guid()){
+               $user = get_user(elgg_get_page_owner_guid());
                $url = $vars['url'];
                $ts = time();
                $token = generate_action_token($ts);
index f5bd1bdce684b04c28ec387ae73f6b3ecac8aacd..0491925c6d1f13c3f8780446df78ac6b46f1e449 100644 (file)
@@ -10,7 +10,7 @@
     <!-- the person posting an item on the message board -->
     <input type="hidden" name="guid" value="<?php echo $_SESSION['guid']; ?>"  />
     <!-- the page owner, this will be the profile owner -->
-    <input type="hidden" name="pageOwner" value="<?php echo page_owner(); ?>"  />
+    <input type="hidden" name="pageOwner" value="<?php echo elgg_get_page_owner_guid(); ?>"  />
     <?php echo elgg_view('input/securitytoken'); ?>
     <!-- submit messages input -->
     <input type="submit" id="postit" value="<?php echo elgg_echo('profile:commentwall:add'); ?>">
index 045436da48f3edd441a58be655b1c284eedcb102..310536527076241535858b15e0356482c7770517 100644 (file)
@@ -14,7 +14,7 @@
        <p><label>
                <?php echo elgg_echo('user:name:label'); ?></label>
                <?php   
-                       echo elgg_view('input/text',array('internalname' => 'name', 'value' => page_owner_entity()->name));
+                       echo elgg_view('input/text',array('internalname' => 'name', 'value' => elgg_get_page_owner()->name));
                ?>
        </p>
 
@@ -73,7 +73,7 @@
 ?>
 
        <p>
-               <input type="hidden" name="username" value="<?php echo page_owner_entity()->username; ?>" />
+               <input type="hidden" name="username" value="<?php echo elgg_get_page_owner()->username; ?>" />
                <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" />
        </p>
 
index 404d123c8faeb4f47a87219b19b5e615543f0ee5..6dc8e0948e4940f9a6fb4b64e8691c9b0bece1ef 100644 (file)
@@ -18,9 +18,9 @@ $banned = $vars['entity']->isBanned();
        
 // Simple XFN
 $rel = "";
-if (page_owner() == $vars['entity']->guid)
+if (elgg_get_page_owner_guid() == $vars['entity']->guid)
        $rel = 'me';
-else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid))
+else if (check_entity_relationship(elgg_get_page_owner_guid(), 'friend', $vars['entity']->guid))
        $rel = 'friend';
                
 if (!$banned) {
index e67d19c042d3fed4bf18cdc54856e7fa8a599fb8..a90b124946734192d9df9d568818bac83f527e86 100644 (file)
@@ -6,6 +6,6 @@
  * 
  */
 
-if ($owner = page_owner_entity()) { ?>
+if ($owner = elgg_get_page_owner()) { ?>
        <link rel="meta" type="application/rdf+xml" title="FOAF" href="<?php echo full_url(); ?>?view=foaf" />
 <?php } ?>
\ No newline at end of file
index 6a214557dc912e0f3780ba8b845e71441db30d75..360ea0f9eabee0f0202555457bd2f0cb6c4a5972 100755 (executable)
@@ -6,9 +6,9 @@
 
 // Simple XFN
 $rel = "";
-if (page_owner() == $vars['entity']->guid) {
+if (elgg_get_page_owner_guid() == $vars['entity']->guid) {
        $rel = 'me';
-} else if (check_entity_relationship(page_owner(), 'friend', $vars['entity']->guid)) {
+} else if (check_entity_relationship(elgg_get_page_owner_guid(), 'friend', $vars['entity']->guid)) {
        $rel = 'friend';
 }
 
index 58386fc04c300ea520b76a677733cd4c24893f33..57c1dfb8b1041728aa9656bff7a319a145f3e0b1 100755 (executable)
@@ -12,7 +12,7 @@ if ($vars['entity']) {
                $user = get_entity($vars['entity']->guid);
        }
 } else {
-       $user = page_owner_entity();
+       $user = elgg_get_page_owner();
 }
 if (!$user) {
        // no user so we quit view
@@ -36,7 +36,7 @@ if ($section == 'details') {
        $more_info .= "</div>";
 }
 $profile_actions = "";
-if (isloggedin() && (get_loggedin_userid() == page_owner())) {
+if (isloggedin() && (get_loggedin_userid() == elgg_get_page_owner_guid())) {
        $profile_actions = "<div class='clearfloat profile_actions'>";
        $profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/details' class='action_button'>". elgg_echo('profile:edit') ."</a>";
        $profile_actions .= "<a href='{$vars['url']}pg/profile/{$user->username}/edit/icon' class='action_button'>". elgg_echo('profile:editicon') ."</a>";
index 9b6032d0412fd9c08de437e9d77c82c9088cebd0..9a377b2d3cf72cfcbbf58f50f2461c24fbeb8a88 100644 (file)
@@ -12,7 +12,7 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 gatekeeper();
 
 // 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($page_owner->getGUID());
index dc9666185217a9e93ca65e2231e43b914ee1b762..a290d8e379e57c0c5fc3861a025287e315c2e8e3 100644 (file)
@@ -4,6 +4,6 @@
        if (!isset($num_items)) $num_items = 30;
 
   $prev_context = get_context();       
-  echo display_tagcloud(1, $num_items, 'tags', '', '', page_owner());
+  echo display_tagcloud(1, $num_items, 'tags', '', '', elgg_get_page_owner_guid());
   set_context($prev_context);
 ?>
index 489427975633c0068a44d1c19da4dba82807e31a..a0bc1757d8fa783368621e576afdb8137cf616ba 100644 (file)
                require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
                
        // 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($page_owner->getGUID());
                }
                
        // title
-               if (page_owner() == $_SESSION['guid']) {
+               if (elgg_get_page_owner_guid() == $_SESSION['guid']) {
                    $area2 = elgg_view_title(elgg_echo("thewire:read"));
            } else {
                    $area2 = elgg_view_title(sprintf(elgg_echo("thewire:user"),$page_owner->name));
index 5091f5e5c72a833bf84859296f87c81b4955a1b4..097d740013bc57017b2d7bf16653fcdb7b05474b 100644 (file)
@@ -60,7 +60,7 @@
 
                        //add submenu options
                                if (get_context() == "thewire") {
-                                       if ((page_owner() == $_SESSION['guid'] || !page_owner()) && isloggedin()) {
+                                       if ((elgg_get_page_owner_guid() == $_SESSION['guid'] || !elgg_get_page_owner_guid()) && isloggedin()) {
                                                add_submenu_item(elgg_echo('thewire:read'),$CONFIG->wwwroot."pg/thewire/" . get_loggedin_user()->username);
                                                add_submenu_item(elgg_echo('thewire:everyone'),$CONFIG->wwwroot."mod/thewire/everyone.php");
                                                //add_submenu_item(elgg_echo('thewire:add'),$CONFIG->wwwroot."mod/thewire/add.php");
index 39fe368d0db523ef18bc97410147a5b5e9258d07..c3f9e78584bc2a93f7a41f6a2dde0fc7eb0eb085 100644 (file)
@@ -10,6 +10,6 @@ $content = elgg_list_entities(array('types' => 'object', 'subtypes' => 'thewire'
 echo $content;
 
 if ($content) {
-       $blogurl = $vars['url'] . "pg/thewire/" . page_owner_entity()->username;
+       $blogurl = $vars['url'] . "pg/thewire/" . elgg_get_page_owner()->username;
        echo "<div class=\"shares_widget_wrapper\"><a href=\"{$blogurl}\">".elgg_echo('thewire:moreposts')."</a></div>";
 }
index 10128ffc793fdef10b48a90a99b629d4a8abecdf..e9ff87c16c000f9f2c02c0a90c6ae399ae503e0f 100644 (file)
@@ -6,11 +6,11 @@
  * @subpackage Core
  */
 
-$owner = page_owner_entity();
+$owner = elgg_get_page_owner();
 if (!$owner) {
        gatekeeper();
        set_page_owner(get_loggedin_userid());
-       $owner = page_owner_entity();
+       $owner = elgg_get_page_owner();
 }
 
 $title = sprintf(elgg_echo("friends:owned"), $owner->name);
index b8740b88e7c7cf64ca717517e986b42c73e47451..0e09e09f0a17860f6c61d2d45cf7628685b04e2b 100644 (file)
@@ -6,11 +6,11 @@
  * @subpackage Core
  */
 
-$owner = page_owner_entity();
+$owner = elgg_get_page_owner();
 if (!$owner) {
        gatekeeper();
        set_page_owner(get_loggedin_userid());
-       $owner = page_owner_entity();
+       $owner = elgg_get_page_owner();
 }
 
 $title = sprintf(elgg_echo("friends:of:owned"), $owner->name);
index c04b1d3834760896d74d206719160f4c928f4d0e..00661c2b1e1a7799ef2ff34a04731882e56e3d4e 100644 (file)
@@ -22,7 +22,7 @@ if (!$members) {
 $friendspicker = (int) get_input('friendspicker', 0);
 
 // Get page owner (bomb out if there isn't one)
-$pageowner = page_owner_entity();
+$pageowner = elgg_get_page_owner();
 if (!$pageowner) {
        forward();
        exit;
index 01a60d7537aff023ca63a4cd4235d122c4c50836..dbc8c87da2cd3a54add8975f2278eda37f565487 100644 (file)
@@ -6,14 +6,14 @@
  * @subpackage Core
  */
 
-if (!page_owner()) {
+if (!elgg_get_page_owner_guid()) {
        set_page_owner(get_loggedin_userid());
 }
 
 // Make sure we don't open a security hole ...
-if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
 // Forward to the user settings
-forward('pg/settings/user/' . page_owner_entity()->username . "/");
\ No newline at end of file
+forward('pg/settings/user/' . elgg_get_page_owner()->username . "/");
\ No newline at end of file
index a003be64487bfda042de799836cc8822cabb635e..a768e69d7209dcecb83d6a1d081a9165932accbe 100644 (file)
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
index cd73c396bf3cf30310f574560001e4e9e4b415c3..38b0094ee6950b250be79a2100a8b5a913796288 100644 (file)
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
index 6482ac9bf1965d96c2a8aa78469d55e70c8c36a2..62a3bb1baf9a06960d69bb122f01ad309b1d4199 100644 (file)
@@ -10,7 +10,7 @@
 gatekeeper();
 
 // Make sure we don't open a security hole ...
-if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) {
+if ((!elgg_get_page_owner()) || (!elgg_get_page_owner()->canEdit())) {
        set_page_owner(get_loggedin_userid());
 }
 
index 8526b9d9212fd02285b892a53255e223d637856c..001755932fc70a8f969ce0ced47ec62819237b32 100644 (file)
@@ -6,11 +6,11 @@
 
                $widgettypes = get_widget_types();
                
-               $owner = page_owner_entity();
+               $owner = elgg_get_page_owner();
                
-               $area1widgets = get_widgets(page_owner(),get_context(),1);
-               $area2widgets = get_widgets(page_owner(),get_context(),2);
-               $area3widgets = get_widgets(page_owner(),get_context(),3);
+               $area1widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),1);
+               $area2widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),2);
+               $area3widgets = get_widgets(elgg_get_page_owner_guid(),get_context(),3);
                
                if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
                        
@@ -23,7 +23,7 @@
 
                        
                
-               if(get_loggedin_userid() == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){
+               if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){
                
                        if(get_context() == "profile") {
                ?>
@@ -246,7 +246,7 @@ if(get_context() != "profile"){ /* on groups */
 <textarea type="textarea" value="Right widgets"  style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea>
 
 <input type="hidden" name="context" value="<?php echo get_context(); ?>" />
-<input type="hidden" name="owner" value="<?php echo page_owner(); ?>" />
+<input type="hidden" name="owner" value="<?php echo elgg_get_page_owner_guid(); ?>" />
 <input type="submit" onfocus="blur()" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" />
 <input type="button" onfocus="blur()" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" />
 
@@ -270,7 +270,7 @@ if(get_context() != "profile"){ /* on groups */
     <td rowspan="2" align="left" valign="top" height="100%">
 
        <?php   
-               if(get_loggedin_userid() == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){
+               if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){
                
                        if(get_context() != "profile") {
                ?>
index 0da9f4c30e3a2323d9f54cf47f32dcad1604b44f..c7a27a16f4a89354c8aa4bdd6ed5daaa636e7cdd 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 global $NOTIFICATION_HANDLERS;
-$notification_settings = get_user_notification_settings(page_owner());
+$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
 
 ?>
 <div class="user_settings notifications">
index 4c3197b5818ee7baee9688d2f3c7c15a976ec44c..91e73f4afd405aa7aca4e43b7ff071b7afc2ec54 100644 (file)
@@ -17,7 +17,7 @@
  * @subpackage Core
  */
 
-$page_owner = page_owner_entity();
+$page_owner = elgg_get_page_owner();
 $logged_in_user = get_loggedin_user();
 $username = $logged_in_user->username;
 
index 14b35d87f4ccbbc2fe14d50addefad5b2049fa86..82909e1b5a3829c4de05c9a50222fc0d74f5256d 100644 (file)
@@ -8,8 +8,8 @@
  *\r
  */\r
 \r
-$page_owner = page_owner_entity();\r
-$name = page_owner_entity()->name;\r
+$page_owner = elgg_get_page_owner();\r
+$name = elgg_get_page_owner()->name;\r
 \r
 // get the object type\r
 $type = $vars['type'];\r
index 649591058dd743cb00b9651cbd78fc3893b3d43d..45e4f70af85f353bb1d0b6ff79b78eb47d28bc25 100644 (file)
@@ -28,7 +28,7 @@ END;
 
 if(is_plugin_enabled('profile')) {
        // Is there a page owner?
-       $owner = page_owner_entity();
+       $owner = elgg_get_page_owner();
        if ($owner instanceof ElggGroup ||
                ($owner instanceof ElggUser && $owner->getGUID() != get_loggedin_userid())
        ) {
index a340e7a090d56089c0b0dec85c0479a1cc729980..5eb628976ef043399839acbc202bea4a57ed5736 100644 (file)
@@ -4,7 +4,7 @@
  * @uses $vars['title'] The page title
  */
 
-$page_owner = page_owner();
+$page_owner = elgg_get_page_owner_guid();
 $page_owner_entity = get_entity($page_owner);
 
 $display = "<h2>" . $vars['title'] . "</h2>";
index 30f3da8b6471e2a5234e27758bb14b6ec6526bef..c557fd09da0380c2b2521ed45576d79755f7cccb 100644 (file)
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 if ($vars['config']->allow_user_default_access) {
-       $user = page_owner_entity();
+       $user = elgg_get_page_owner();
 
        if ($user) {
                if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
index 19902d53227b078d389a48cda0a50662c5e94461..0a08b1faf58473400862b9da9b0d537816565ab6 100644 (file)
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 
 if ($user) {
 ?>
index fd93cfbba731c6a1fd0c5ae7f667a21606df0bbb..06486ae3e82fe1f1d810340d3176785018eea59d 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 global $CONFIG;
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 
 if ($user) {
 ?>
index 5111b5db1fa7aeaad6a5c33c78e45470be9966a6..fad6c488f8af878f8ffb4f8133a8e77a2aea276f 100644 (file)
@@ -8,7 +8,7 @@
 
  */
 
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 
 // all hidden, but necessary for properly updating user details
 echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name));
index 82806e06be426a7caa1829d51dbbab0d14b53894..ea7be401d4bb2319f71acf97acf09c8871e38fd5 100644 (file)
@@ -6,7 +6,7 @@
  * @subpackage Core
  */
 
-$user = page_owner_entity();
+$user = elgg_get_page_owner();
 
 if ($user) {
 ?>
index 45068adfed8e4947babbb5c33f49b10617e96aac..572624034e5bb7ee29ed54422500d9ec8a91244c 100644 (file)
@@ -28,7 +28,7 @@ $(document).ready(function() {
                $.post($("#widgetform<?php echo $guid; ?>").attr("action"),variables,function() {
                        $("#submit<?php echo $guid; ?>").attr("disabled","");
                        $("#submit<?php echo $guid; ?>").attr("value","<?php echo elgg_echo("save"); ?>");
-                       $("#widgetcontent<?php echo $guid; ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
+                       $("#widgetcontent<?php echo $guid; ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
                });
                return false;
 
index 888938d97b9d827ddfd539a5117b7a2fc8303902..d66563858252f9dfa16754b759681463babbb11f 100644 (file)
@@ -87,7 +87,7 @@ if ($callback != "true") {
 <script type="text/javascript">
 $(document).ready(function() {
 
-       $("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo page_owner_entity()->username; ?>&context=widget&callback=true");
+       $("#widgetcontent<?php echo $vars['entity']->getGUID(); ?>").load("<?php echo $vars['url']; ?>pg/view/<?php echo $vars['entity']->getGUID(); ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=widget&callback=true");
 
        // run function to check for widgets collapsed/expanded state
        var forWidget = "widget<?php echo $vars['entity']->getGUID(); ?>";
index cd74ce0fe60c647f3126347a3f9fb9612b42f9c8..bf8d0b564ab2e01a7f66c9e0d9579c071eb9290f 100644 (file)
@@ -12,7 +12,7 @@ header("Content-Type: text/xml");
 
 echo "<?xml version='1.0'?>\n";
 
-if (!$owner = page_owner_entity()) {
+if (!$owner = elgg_get_page_owner()) {
        if (!isloggedin()) {
                exit;
        } else {