Fixes #2808: elgg_get_array_value => elgg_extract

git-svn-id: http://code.elgg.org/elgg/trunk@8247 36083f99-b078-4883-b0ff-0f9b5a30f544

2 files changed, 5 insertions, 5 deletions

diff --git a/views/default/layout/shells/content/filter.php b/views/default/layout/shells/content/filter.php
index c9f774e72..6bd91dc1a 100644
--- a/views/default/layout/shells/content/filter.php
+++ b/views/default/layout/shells/content/filter.php
@@ -14,11 +14,11 @@ if (isset($vars['filter_override'])) {
 	return true;
 }
 
-$context = elgg_get_array_value('context', $vars, elgg_get_context());
+$context = elgg_extract('context', $vars, elgg_get_context());
 
 if (elgg_is_logged_in() && $context) {
 	$username = elgg_get_logged_in_user_entity()->username;
-	$filter_context = elgg_get_array_value('filter_context', $vars, 'everyone');
+	$filter_context = elgg_extract('filter_context', $vars, 'everyone');
 
 	// generate a list of default tabs
 	$tabs = array(
diff --git a/views/default/layout/shells/content/header.php b/views/default/layout/shells/content/header.php
index 92456bac4..7a3ab1ae9 100644
--- a/views/default/layout/shells/content/header.php
+++ b/views/default/layout/shells/content/header.php
@@ -15,9 +15,9 @@ if (isset($vars['header_override'])) {
 	return true;
 }
 
-$context = elgg_get_array_value('context', $vars, elgg_get_context());
+$context = elgg_extract('context', $vars, elgg_get_context());
 if ($context) {
-	$title = elgg_get_array_value('title', $vars, '');
+	$title = elgg_extract('title', $vars, '');
 	if (!$title) {
 		$title = elgg_echo($context);
 	}
@@ -32,7 +32,7 @@ if ($context) {
 			} else {
 				$guid = elgg_get_logged_in_user_guid();
 			}
-			$new_link = elgg_get_array_value('new_link', $vars, "pg/$context/add/$guid/");
+			$new_link = elgg_extract('new_link', $vars, "pg/$context/add/$guid/");
 			$params = array(
 				'href' => $new_link = elgg_normalize_url($new_link),
 				'text' => elgg_echo("$context:add"),