8 files changed, 26 insertions, 26 deletions
diff --git a/views/default/layout/objects/gallery.php b/views/default/layout/objects/gallery.php
index 4135de9df..f57cc99ba 100644
--- a/views/default/layout/objects/gallery.php
+++ b/views/default/layout/objects/gallery.php
@@ -17,10 +17,10 @@ elgg_push_context('gallery');
 $offset = $vars['offset'];
 $limit = $vars['limit'];
 $count = $vars['count'];
-$pagination = elgg_get_array_value('pagination', $vars, true);
-$full_view = elgg_get_array_value('full_view', $vars, false);
-$offset_key = elgg_get_array_value('offset_key', $vars, 'offset');
-$position = elgg_get_array_value('position', $vars, 'after');
+$pagination = elgg_extract('pagination', $vars, true);
+$full_view = elgg_extract('full_view', $vars, false);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
 
 $num_columns = 4;
 
diff --git a/views/default/layout/objects/image_block.php b/views/default/layout/objects/image_block.php
index 1aecccf28..a7f480aef 100644
--- a/views/default/layout/objects/image_block.php
+++ b/views/default/layout/objects/image_block.php
@@ -19,12 +19,12 @@
  * @uses $vars['id']          Optional id for the media element
  */
 
-$body = elgg_get_array_value('body', $vars, '');
-$image = elgg_get_array_value('image', $vars, '');
-$alt_image = elgg_get_array_value('image_alt', $vars, '');
+$body = elgg_extract('body', $vars, '');
+$image = elgg_extract('image', $vars, '');
+$alt_image = elgg_extract('image_alt', $vars, '');
 
 $class = 'elgg-image-block';
-$additional_class = elgg_get_array_value('class', $vars, '');
+$additional_class = elgg_extract('class', $vars, '');
 if ($additional_class) {
 	$class = "$class $additional_class";
 }
diff --git a/views/default/layout/objects/list.php b/views/default/layout/objects/list.php
index 6d12c5e55..374922ecd 100644
--- a/views/default/layout/objects/list.php
+++ b/views/default/layout/objects/list.php
@@ -21,10 +21,10 @@ $offset = $vars['offset'];
 $limit = $vars['limit'];
 $count = $vars['count'];
 $base_url = $vars['base_url'];
-$pagination = elgg_get_array_value('pagination', $vars, true);
-$full_view = elgg_get_array_value('full_view', $vars, false);
-$offset_key = elgg_get_array_value('offset_key', $vars, 'offset');
-$position = elgg_get_array_value('position', $vars, 'after');
+$pagination = elgg_extract('pagination', $vars, true);
+$full_view = elgg_extract('full_view', $vars, false);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
 
 $list_class = 'elgg-list';
 if (isset($vars['list_class'])) {
diff --git a/views/default/layout/objects/list/body.php b/views/default/layout/objects/list/body.php
index 6cbaa2c20..187cc9690 100644
--- a/views/default/layout/objects/list/body.php
+++ b/views/default/layout/objects/list/body.php
@@ -19,7 +19,7 @@
 
 $entity = $vars['entity'];
 
-$title_link = elgg_get_array_value('title', $vars, '');
+$title_link = elgg_extract('title', $vars, '');
 if ($title_link === '') {
 	if (isset($entity->title)) {
 		$text = $entity->title;
@@ -33,11 +33,11 @@ if ($title_link === '') {
 	$title_link = elgg_view('output/url', $params);
 }
 
-$metadata = elgg_get_array_value('metadata', $vars, '');
-$subtitle = elgg_get_array_value('subtitle', $vars, '');
-$content = elgg_get_array_value('content', $vars, '');
+$metadata = elgg_extract('metadata', $vars, '');
+$subtitle = elgg_extract('subtitle', $vars, '');
+$content = elgg_extract('content', $vars, '');
 
-$tags = elgg_get_array_value('tags', $vars, '');
+$tags = elgg_extract('tags', $vars, '');
 if ($tags !== false) {
 	$tag_text = elgg_view('output/tags', array('tags' => $entity->tags));
 	if ($tag_text) {
diff --git a/views/default/layout/objects/list/metadata.php b/views/default/layout/objects/list/metadata.php
index bb708b5ee..3ce3573b9 100644
--- a/views/default/layout/objects/list/metadata.php
+++ b/views/default/layout/objects/list/metadata.php
@@ -8,7 +8,7 @@
  */
 
 $entity = $vars['entity'];
-$handler = elgg_get_array_value('handler', $vars, '');
+$handler = elgg_extract('handler', $vars, '');
 
 ?>
 <ul class="elgg-list-metadata">
diff --git a/views/default/layout/objects/module.php b/views/default/layout/objects/module.php
index 5f1273ddd..f7b9da59c 100644
--- a/views/default/layout/objects/module.php
+++ b/views/default/layout/objects/module.php
@@ -11,14 +11,14 @@
  * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
  */
 
-$title = elgg_get_array_value('title', $vars, '');
-$header = elgg_get_array_value('header', $vars, '');
-$body = elgg_get_array_value('body', $vars, '');
-$footer = elgg_get_array_value('footer', $vars, '');
-$show_inner = elgg_get_array_value('show_inner', $vars, false);
+$title = elgg_extract('title', $vars, '');
+$header = elgg_extract('header', $vars, '');
+$body = elgg_extract('body', $vars, '');
+$footer = elgg_extract('footer', $vars, '');
+$show_inner = elgg_extract('show_inner', $vars, false);
 
 $class = 'elgg-module';
-$additional_class = elgg_get_array_value('class', $vars, '');
+$additional_class = elgg_extract('class', $vars, '');
 if ($additional_class) {
 	$class = "$class $additional_class";
 }
diff --git a/views/default/layout/objects/widget.php b/views/default/layout/objects/widget.php
index 727b04533..d5e2c4ca2 100644
--- a/views/default/layout/objects/widget.php
+++ b/views/default/layout/objects/widget.php
@@ -11,7 +11,7 @@ if (!elgg_instanceof($widget, 'object', 'widget')) {
 	return true;
 }
 
-$show_access = elgg_get_array_value('show_access', $vars, true);
+$show_access = elgg_extract('show_access', $vars, true);
 
 // @todo catch for disabled plugins
 $widget_types = elgg_get_widget_types('all');
diff --git a/views/default/layout/objects/widget/controls.php b/views/default/layout/objects/widget/controls.php
index bd1e96ea7..be7a10083 100644
--- a/views/default/layout/objects/widget/controls.php
+++ b/views/default/layout/objects/widget/controls.php
@@ -7,7 +7,7 @@
  */
 
 $widget = $vars['widget'];
-$show_edit = elgg_get_array_value('show_edit', $vars, true);
+$show_edit = elgg_extract('show_edit', $vars, true);
 
 $params = array(
 	'text' => ' ',