From db7b497114329dda5f560198884c5bc5fbb3c1a8 Mon Sep 17 00:00:00 2001 From: cash Date: Wed, 3 Nov 2010 02:13:36 +0000 Subject: Fixes #2128 - replaces all uses of set_context() and get_context() in core and plugins git-svn-id: http://code.elgg.org/elgg/trunk@7215 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/groups/all.php | 4 ++-- mod/groups/forum.php | 2 +- mod/groups/groupprofile.php | 2 +- mod/groups/index.php | 4 ++-- mod/groups/membership.php | 4 ++-- mod/groups/start.php | 4 ++-- mod/groups/views/default/object/groupforumtopic.php | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/all.php b/mod/groups/all.php index 666c6ad4b..da884bac7 100644 --- a/mod/groups/all.php +++ b/mod/groups/all.php @@ -15,7 +15,7 @@ $filter = "newest"; } - $context = get_context(); + $context = elgg_get_context(); switch($filter){ case "newest": @@ -50,7 +50,7 @@ $featured_groups = elgg_get_entities_from_metadata(array('metadata_name' => 'featured_group', 'metadata_value' => 'yes', 'types' => 'group', 'limit' => 10)); $area2 .= elgg_view("groups/featured", array("featured" => $featured_groups)); - set_context($context); + elgg_set_context($context); $objects = "
".$objects."
"; diff --git a/mod/groups/forum.php b/mod/groups/forum.php index 603743009..376098f80 100644 --- a/mod/groups/forum.php +++ b/mod/groups/forum.php @@ -35,7 +35,7 @@ elgg_push_breadcrumb(elgg_echo('item:object:groupforumtopic')); $area1 = elgg_view('navigation/breadcrumbs'); $area1 .= elgg_view("forum/topics", array('topics' => $topics, 'group_guid' => $group_guid)); -set_context('groups'); +elgg_set_context('groups'); $body = elgg_view_layout('one_column_with_sidebar', $area1); diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php index ffa96d71d..bb577fde2 100644 --- a/mod/groups/groupprofile.php +++ b/mod/groups/groupprofile.php @@ -6,7 +6,7 @@ */ $group_guid = get_input('group_guid'); - set_context('groups'); + elgg_set_context('groups'); global $autofeed; $autofeed = true; diff --git a/mod/groups/index.php b/mod/groups/index.php index de1363ae6..457d2eb55 100644 --- a/mod/groups/index.php +++ b/mod/groups/index.php @@ -15,9 +15,9 @@ // Get objects $area1 = elgg_view('page_elements/content_header', array('context' => "everyone", 'type' => 'groups', 'new_link' => "pg/groups/new")); - set_context('search'); + elgg_push_context('search'); $objects = elgg_list_entities(array('types' => 'group', 'owner_guid' => elgg_get_page_owner_guid(), 'limit' => $limit, 'offset' => $offset, 'full_view' => FALSE)); - set_context('groups'); + elgg_pop_context(); $area1 .= $objects; $body = elgg_view_layout('one_column_with_sidebar', $area1); diff --git a/mod/groups/membership.php b/mod/groups/membership.php index bfce96741..dd5fd675b 100644 --- a/mod/groups/membership.php +++ b/mod/groups/membership.php @@ -21,10 +21,10 @@ // Get objects $area2 = elgg_view('page_elements/content_header', array('context' => "mine", 'type' => 'groups', 'new_link' => "pg/groups/new")); - set_context('search'); + elgg_push_context('search'); // offset is grabbed in the list_entities_from_relationship() function $objects = list_entities_from_relationship('member',page_owner(),false,'group','',0, $limit,false, false); - set_context('groups'); + elgg_pop_context(); $area2 .= $objects; $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2); diff --git a/mod/groups/start.php b/mod/groups/start.php index f24a3106a..8e5befb74 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -202,7 +202,7 @@ // Get the page owner entity $page_owner = elgg_get_page_owner(); - if (get_context() == 'groups') { + if (elgg_get_context() == 'groups') { if ($page_owner instanceof ElggGroup) { if (isloggedin() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) { $url = elgg_get_site_url()."mod/groups/membershipreq.php?group_guid={$page_owner->getGUID()}"; @@ -267,7 +267,7 @@ include($CONFIG->pluginspath . "groups/new.php"); break; case "world": - set_context('groups'); + elgg_set_context('groups'); set_page_owner(0); include($CONFIG->pluginspath . "groups/all.php"); break; diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php index 2d5b1e094..fb67797d3 100644 --- a/mod/groups/views/default/object/groupforumtopic.php +++ b/mod/groups/views/default/object/groupforumtopic.php @@ -24,7 +24,7 @@ if ($last_post) { $u = get_user($last_user); //select the correct output depending on where you are -if (get_context() == "search") { +if (elgg_get_context() == "search") { var_export($counter); if($counter == 1){ $info = "

" . sprintf(elgg_echo('groups:forum:created:single'), $forum_created, $counter) . "
"; -- cgit v1.2.3