Fixes #2808: elgg_get_array_value => elgg_extract

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

4 files changed, 10 insertions, 10 deletions

diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index 9b875fdeb..8f4ee4cb2 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -9,10 +9,10 @@
  * @uses string $vars['active_section'] Currently selected section_id
  */
 
-$sections = elgg_get_array_value('sections', $vars, array());
-$active_section = elgg_get_array_value('active_section', $vars, array_shift(array_keys($sections)));
-$upload_sections = elgg_get_array_value('upload_sections', $vars, array());
-$internal_name = elgg_get_array_value('internal_name', $vars);
+$sections = elgg_extract('sections', $vars, array());
+$active_section = elgg_extract('active_section', $vars, array_shift(array_keys($sections)));
+$upload_sections = elgg_extract('upload_sections', $vars, array());
+$internal_name = elgg_extract('internal_name', $vars);
 
 if (!$sections) {
 	$content = elgg_echo('embed:no_sections');
@@ -100,7 +100,7 @@ if (!$sections) {
 						'item' => $item,
 						'ecml_enabled' => $ecml_enabled,
 						'ecml_keyword' => ($ecml_valid_keyword) ? $active_section : 'entity',
-						'icon_size' => elgg_get_array_value('icon_size', $section_info, 'tiny'),
+						'icon_size' => elgg_extract('icon_size', $section_info, 'tiny'),
 					);
 	
 					$items_content .= elgg_view($view, $item_params);
diff --git a/mod/embed/views/default/embed/layouts/gallery.php b/mod/embed/views/default/embed/layouts/gallery.php
index b24fcec24..5ef564017 100644
--- a/mod/embed/views/default/embed/layouts/gallery.php
+++ b/mod/embed/views/default/embed/layouts/gallery.php
@@ -5,8 +5,8 @@
  * @uses string $vars['content'] Pre-formatted content.
  *
  */
-$active_section = elgg_get_array_value('section', $vars, array());
+$active_section = elgg_extract('section', $vars, array());
 
-$content = "<div class='embed_modal_".$active_section."'>" . elgg_get_array_value('content', $vars, '') . "</div>";
+$content = "<div class='embed_modal_".$active_section."'>" . elgg_extract('content', $vars, '') . "</div>";
 
 echo $content;
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/layouts/list.php b/mod/embed/views/default/embed/layouts/list.php
index 76e7e88ea..1a98ece5c 100644
--- a/mod/embed/views/default/embed/layouts/list.php
+++ b/mod/embed/views/default/embed/layouts/list.php
@@ -5,8 +5,8 @@
  * @uses string $vars['content'] Pre-formatted content.
  *
  */
-$active_section = elgg_get_array_value('section', $vars, array());
+$active_section = elgg_extract('section', $vars, array());
 
-$content = "<div class='embed_modal_" . $active_section . "'>" . elgg_get_array_value('content', $vars, '') . "</div>";
+$content = "<div class='embed_modal_" . $active_section . "'>" . elgg_extract('content', $vars, '') . "</div>";
 
 echo $content;
\ No newline at end of file
diff --git a/mod/embed/views/default/embed/upload/content.php b/mod/embed/views/default/embed/upload/content.php
index 874ed44b1..a8330bce0 100644
--- a/mod/embed/views/default/embed/upload/content.php
+++ b/mod/embed/views/default/embed/upload/content.php
@@ -2,7 +2,7 @@
 /**
  * Special upload form
  */
-$upload_sections = elgg_get_array_value('upload_sections', $vars, array());
+$upload_sections = elgg_extract('upload_sections', $vars, array());
 $active_section = get_input('active_upload_section', array_shift(array_keys($upload_sections)));
 
 $options = array();