diff options
Diffstat (limited to 'views/default/navigation')
| -rw-r--r-- | views/default/navigation/breadcrumbs.php | 2 | ||||
| -rw-r--r-- | views/default/navigation/menu/elements/group.php | 2 | ||||
| -rw-r--r-- | views/default/navigation/menu/user_hover.php | 6 | ||||
| -rw-r--r-- | views/default/navigation/pagination.php | 12 | ||||
| -rw-r--r-- | views/default/navigation/tabs.php | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/views/default/navigation/breadcrumbs.php b/views/default/navigation/breadcrumbs.php index 67e985bed..53d1ffaaf 100644 --- a/views/default/navigation/breadcrumbs.php +++ b/views/default/navigation/breadcrumbs.php @@ -18,7 +18,7 @@ if (isset($vars['breadcrumbs'])) { } $class = 'elgg-breadcrumbs'; -$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/navigation/menu/elements/group.php b/views/default/navigation/menu/elements/group.php index 09474ea67..b0c0f54d4 100644 --- a/views/default/navigation/menu/elements/group.php +++ b/views/default/navigation/menu/elements/group.php @@ -7,7 +7,7 @@ * @uses $vars['section'] */ -$class = elgg_get_array_value('class', $vars, ''); +$class = elgg_extract('class', $vars, ''); if (isset($vars['section'])) { $class = "$class elgg-section-{$vars['section']}"; } diff --git a/views/default/navigation/menu/user_hover.php b/views/default/navigation/menu/user_hover.php index 9ceda38e5..bbca41e21 100644 --- a/views/default/navigation/menu/user_hover.php +++ b/views/default/navigation/menu/user_hover.php @@ -9,9 +9,9 @@ */ $user = $vars['entity']; -$actions = elgg_get_array_value('action', $vars['menu'], null); -$main = elgg_get_array_value('default', $vars['menu'], null); -$admin = elgg_get_array_value('admin', $vars['menu'], null); +$actions = elgg_extract('action', $vars['menu'], null); +$main = elgg_extract('default', $vars['menu'], null); +$admin = elgg_extract('admin', $vars['menu'], null); echo '<ul class="elgg-menu elgg-menu-hover">'; diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php index 98b85201e..c0cb801dd 100644 --- a/views/default/navigation/pagination.php +++ b/views/default/navigation/pagination.php @@ -17,17 +17,17 @@ if (elgg_in_context('widget')) { return true; } -$offset = abs((int) elgg_get_array_value('offset', $vars, 0)); +$offset = abs((int) elgg_extract('offset', $vars, 0)); // because you can say $vars['limit'] = 0 -if (!$limit = (int) elgg_get_array_value('limit', $vars, 10)) { +if (!$limit = (int) elgg_extract('limit', $vars, 10)) { $limit = 10; } -$count = (int) elgg_get_array_value('count', $vars, 0); -$offset_key = elgg_get_array_value('offset_key', $vars, 'offset'); -$base_url = elgg_get_array_value('baseurl', $vars, current_page_url()); +$count = (int) elgg_extract('count', $vars, 0); +$offset_key = elgg_extract('offset_key', $vars, 'offset'); +$base_url = elgg_extract('baseurl', $vars, current_page_url()); -$num_pages = elgg_get_array_value('num_pages', $vars, 10); +$num_pages = elgg_extract('num_pages', $vars, 10); $delta = ceil($num_pages / 2); if ($count <= $limit && $offset == 0) { diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php index 4a5a5e7a9..376464ee5 100644 --- a/views/default/navigation/tabs.php +++ b/views/default/navigation/tabs.php @@ -15,7 +15,7 @@ * ) */ -$type = elgg_get_array_value('type', $vars, 'horizontal'); +$type = elgg_extract('type', $vars, 'horizontal'); if ($type == 'horizontal') { $type_class = "elgg-tabs elgg-htabs"; } else { @@ -31,10 +31,10 @@ if (isset($vars['tabs']) && is_array($vars['tabs']) && !empty($vars['tabs'])) { <ul class="<?php echo $type_class; ?>"> <?php foreach ($vars['tabs'] as $info) { - $class = elgg_get_array_value('class', $info, ''); - $id = elgg_get_array_value('id', $info, ''); + $class = elgg_extract('class', $info, ''); + $id = elgg_extract('id', $info, ''); - $selected = elgg_get_array_value('selected', $info, FALSE); + $selected = elgg_extract('selected', $info, FALSE); if ($selected) { $class .= ' elgg-state-selected'; } |