aboutsummaryrefslogtreecommitdiff
path: root/views/default/page_elements
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-11 01:36:23 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-11 01:36:23 +0000
commit3bfa294985001c2c6ebb58fbf87b2f795e055ca5 (patch)
tree0c1bef5f9afa3f08da345df333dc1a63ed3ffb21 /views/default/page_elements
parent8c756908c5d72a53b1a4dda0901c8fb3d0191408 (diff)
downloadelgg-3bfa294985001c2c6ebb58fbf87b2f795e055ca5.tar.gz
elgg-3bfa294985001c2c6ebb58fbf87b2f795e055ca5.tar.bz2
Fixes #2640 - elgg_view_layout now uses a parameter array like all the other elgg_view* functions
git-svn-id: http://code.elgg.org/elgg/trunk@7288 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/page_elements')
-rw-r--r--views/default/page_elements/sidebar.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/views/default/page_elements/sidebar.php b/views/default/page_elements/sidebar.php
index 2706a23c5..8a5574da6 100644
--- a/views/default/page_elements/sidebar.php
+++ b/views/default/page_elements/sidebar.php
@@ -1,18 +1,26 @@
<?php
/**
* Elgg sidebar contents
- *
+ *
+ * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
**/
echo elgg_view('page_elements/owner_block');
echo elgg_view('navigation/sidebar_menu');
+// optional 'sidebar' parameter
+if (isset($vars['sidebar'])) {
+ echo $vars['sidebar'];
+}
+
+// @todo deprecated so remove in Elgg 2.0
// optional second parameter of elgg_view_layout
if (isset($vars['area2'])) {
echo $vars['area2'];
}
+// @todo deprecated so remove in Elgg 2.0
// optional third parameter of elgg_view_layout
if (isset($vars['area3'])) {
echo $vars['area3'];