5 files changed, 15 insertions, 15 deletions

diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php
index 87d314b2c..69772985a 100644
--- a/views/default/layout/shells/content.php
+++ b/views/default/layout/shells/content.php
@@ -16,13 +16,13 @@
  */
 
 // give plugins an opportunity to add to content sidebars
-$sidebar_content = elgg_get_array_value('sidebar', $vars, '');
+$sidebar_content = elgg_extract('sidebar', $vars, '');
 $params = $vars;
 $params['content'] = $sidebar_content;
 $sidebar = elgg_view('layout/shells/content/sidebar', $params);
 
 // navigation defaults to breadcrumbs
-$nav = elgg_get_array_value('nav', $vars, elgg_view('navigation/breadcrumbs'));
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
 
 // allow page handlers to override the default header
 if (isset($vars['header'])) {
@@ -37,10 +37,10 @@ if (isset($vars['filter'])) {
 $filter = elgg_view('layout/shells/content/filter', $vars);
 
 // the all important content
-$content = elgg_get_array_value('content', $vars, '');
+$content = elgg_extract('content', $vars, '');
 
 // optional footer for main content area
-$footer_content = elgg_get_array_value('footer', $vars, '');
+$footer_content = elgg_extract('footer', $vars, '');
 $params = $vars;
 $params['content'] = $footer_content;
 $footer = elgg_view('layout/shells/content/footer', $params);
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"),
diff --git a/views/default/layout/shells/widgets.php b/views/default/layout/shells/widgets.php
index aa9fa2393..e551f288f 100644
--- a/views/default/layout/shells/widgets.php
+++ b/views/default/layout/shells/widgets.php
@@ -9,11 +9,11 @@
  * @uses $vars['show_access']      Show the access control (true)
  */
 
-$box = elgg_get_array_value('box', $vars, '');
-$num_columns = elgg_get_array_value('num_columns', $vars, 3);
-$show_add_widgets = elgg_get_array_value('show_add_widgets', $vars, true);
-$exact_match = elgg_get_array_value('exact_match', $vars, false);
-$show_access = elgg_get_array_value('show_access', $vars, true);
+$box = elgg_extract('box', $vars, '');
+$num_columns = elgg_extract('num_columns', $vars, 3);
+$show_add_widgets = elgg_extract('show_add_widgets', $vars, true);
+$exact_match = elgg_extract('exact_match', $vars, false);
+$show_access = elgg_extract('show_access', $vars, true);
 
 $owner = elgg_get_page_owner_entity();
 $context = elgg_get_context();
diff --git a/views/default/layout/shells/widgets/add_panel.php b/views/default/layout/shells/widgets/add_panel.php
index ff789cbd3..e6b13d573 100644
--- a/views/default/layout/shells/widgets/add_panel.php
+++ b/views/default/layout/shells/widgets/add_panel.php
@@ -9,7 +9,7 @@
 
 $widgets = $vars['widgets'];
 $context = $vars['context'];
-$exact = elgg_get_array_value('exact_match', $vars, false);
+$exact = elgg_extract('exact_match', $vars, false);
 
 $widget_types = elgg_get_widget_types($context, $exact);