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

9 files changed, 19 insertions, 19 deletions

diff --git a/views/default/admin/overview/online.php b/views/default/admin/overview/online.php
index 19e65a764..00e5c863a 100644
--- a/views/default/admin/overview/online.php
+++ b/views/default/admin/overview/online.php
@@ -8,9 +8,9 @@
 
 // users online
 if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
-	get_context('search');
+	elgg_push_context('search');
 	$users_online = get_online_users();
-	get_context('admin');
+	elgg_pop_context();
 	?>
 
 	<div class="admin_settings members_list users_online">
diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php
index b172b994f..4acaa3f6e 100644
--- a/views/default/admin/users/online.php
+++ b/views/default/admin/users/online.php
@@ -1,9 +1,9 @@
 <?php
 // users online
 if ((is_plugin_enabled('search')) && (is_plugin_enabled('profile'))) {
-	get_context('search');
+	elgg_push_context('search');
 	$users_online = get_online_users();
-	get_context('admin');
+	elgg_pop_context();
 	
 	echo elgg_view_title(elgg_echo('admin:users'));
 	?>
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 0ee972e77..3266b2904 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -20,7 +20,7 @@ $string = sprintf(elgg_echo("river:posted:generic"), $url) . " ";
 $string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "</span>";
-if (get_context() != 'riverdashboard') {
+if (elgg_get_context() != 'riverdashboard') {
 	$comment = elgg_get_excerpt($comment, 200);
 	if ($comment) {
 		$string .= "<div class='river_content_display'>";
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 45eff55c6..932a5ac1d 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -8,9 +8,9 @@
 		
 		$owner = elgg_get_page_owner();
 		
-		$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);
+		$area1widgets = get_widgets(elgg_get_page_owner_guid(), elgg_get_context(), 1);
+		$area2widgets = get_widgets(elgg_get_page_owner_guid(), elgg_get_context(), 2);
+		$area3widgets = get_widgets(elgg_get_page_owner_guid(), elgg_get_context(), 3);
 		
 		if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
 			
@@ -25,7 +25,7 @@
  		
 		if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){
 		
-			if(get_context() == "profile") {
+			if (elgg_get_context() == "profile") {
 		?>
 			<!-- add remove widget button -->
 			<div class="add_widgets" style="margin:-18px 0 10px;">
@@ -88,7 +88,7 @@
     <td colspan="2" align="left" valign="top">
     
     <?php
-if(get_context() != "profile"){ /* on groups */
+if (elgg_get_context() != "profile") { /* on groups */
     ?>
 
 			<h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2>
@@ -105,7 +105,7 @@ if(get_context() != "profile"){ /* on groups */
     
     <td rowspan="2" align="left" valign="top">
 		<h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2>
-		<div id="rightcolumn_widgets" <?php if(get_context() != "profile")echo "class=\"long\""; ?> >
+		<div id="rightcolumn_widgets" <?php if (elgg_get_context() != "profile") echo "class=\"long\""; ?> >
 		<?php
 			$rightcolumn_widgets = "";
 			if (is_array($area3widgets) && sizeof($area3widgets) > 0) {
@@ -245,7 +245,7 @@ if(get_context() != "profile"){ /* on groups */
 <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea>
 <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="context" value="<?php echo elgg_get_context(); ?>" />
 <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();" />
@@ -272,7 +272,7 @@ if(get_context() != "profile"){ /* on groups */
 	<?php 	
 		if(get_loggedin_userid() == elgg_get_page_owner_guid() || ($owner instanceof ElggGroup && $owner->canEdit())){
 		
-			if(get_context() != "profile") {
+			if (elgg_get_context() != "profile") {
 		?>
 			<!-- customise page button appears in different place on groups widgets -->
 			<div class="add_widgets">
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index d193bd433..846598d1b 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -25,7 +25,7 @@ $totalpages = ceil($count / $limit);
 $currentpage = ceil($offset / $limit) + 1;
 
 //only display if there is content to paginate through or if we already have an offset
-if (($count > $limit || $offset > 0) && get_context() != 'widget') {
+if (($count > $limit || $offset > 0) && elgg_get_context() != 'widget') {
 
 	?>
 
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index 0cb867c5f..a7f31c5f9 100644
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -10,7 +10,7 @@ $more = $nav_items['more'];
 
 $nav_html = '';
 $more_nav_html = '';
-$context = get_context();
+$context = elgg_get_context();
 
 // sort more links alphabetically
 $more_sorted = array();
diff --git a/views/default/output/tagcloud.php b/views/default/output/tagcloud.php
index 7270cd5ea..c7e87f688 100644
--- a/views/default/output/tagcloud.php
+++ b/views/default/output/tagcloud.php
@@ -12,7 +12,7 @@
  * @uses $vars['subtype'] Entity subtype
  */
 
-$context = get_context();
+$context = elgg_get_context();
 
 if (!empty($vars['subtype'])) {
 	$subtype = "&entity_subtype=" . urlencode($vars['subtype']);
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index b1a89fdfc..12e4eec44 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -68,7 +68,7 @@ if (isloggedin()) {
 		$tab_list = '';
 	} else {
 		// @todo remove the hard coded reference to the videolist plugin
-		if (get_context() == "videolist"){
+		if (elgg_get_context() == "videolist"){
 			$video_link = elgg_get_site_url() . "pg/videolist/browse/$username/";
 			$new_button = "<a href=\"{$video_link}\" class='action_button'>" . elgg_echo('videolist:browsemenu') . '</a>';
 		} else {
@@ -80,7 +80,7 @@ if (isloggedin()) {
 
 	// also hide the tabs if in a group context (ie, listing groups) or
 	// when viewing tools belonging to a group
-	if (get_context() == 'groups' || $page_owner instanceof ElggGroup) {
+	if (elgg_get_context() == 'groups' || $page_owner instanceof ElggGroup) {
 		$tab_list = '';
 	}
 }
diff --git a/views/default/widgets/editwrapper.php b/views/default/widgets/editwrapper.php
index 9f52ba7f6..0ac1de6d0 100644
--- a/views/default/widgets/editwrapper.php
+++ b/views/default/widgets/editwrapper.php
@@ -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 elgg_get_site_url(); ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo get_context(); ?>&callback=true");
+			$("#widgetcontent<?php echo $guid; ?>").load("<?php echo elgg_get_site_url(); ?>pg/view/<?php echo $guid; ?>?shell=no&username=<?php echo elgg_get_page_owner()->username; ?>&context=<?php echo elgg_get_context(); ?>&callback=true");
 		});
 		return false;