aboutsummaryrefslogtreecommitdiff
path: root/views/default/layout
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/layout')
-rw-r--r--views/default/layout/elements/comments.php2
-rw-r--r--views/default/layout/objects/gallery.php8
-rw-r--r--views/default/layout/objects/image_block.php8
-rw-r--r--views/default/layout/objects/list.php8
-rw-r--r--views/default/layout/objects/list/body.php10
-rw-r--r--views/default/layout/objects/list/metadata.php2
-rw-r--r--views/default/layout/objects/module.php12
-rw-r--r--views/default/layout/objects/widget.php2
-rw-r--r--views/default/layout/objects/widget/controls.php2
-rw-r--r--views/default/layout/shells/content.php8
-rw-r--r--views/default/layout/shells/content/filter.php4
-rw-r--r--views/default/layout/shells/content/header.php6
-rw-r--r--views/default/layout/shells/widgets.php10
-rw-r--r--views/default/layout/shells/widgets/add_panel.php2
14 files changed, 42 insertions, 42 deletions
diff --git a/views/default/layout/elements/comments.php b/views/default/layout/elements/comments.php
index 2d727b8b5..c27a146ab 100644
--- a/views/default/layout/elements/comments.php
+++ b/views/default/layout/elements/comments.php
@@ -7,7 +7,7 @@
* @uses $vars['id'] Optional id for the div
*/
-$show_add_form = elgg_get_array_value('show_add_form', $vars, true);
+$show_add_form = elgg_extract('show_add_form', $vars, true);
$id = '';
if (isset($vars['id'])) {
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' => ' ',
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);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 01:38:03 +0000