Fixes #3319 alternate sidebar should work now

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

diff --git a/views/default/page/elements/sidebar_alt.php b/views/default/page/elements/sidebar_alt.php
index 41982539e48b5ed0611eae37591c6fac0756b590..6d91ca58bcd051999c7afbf6641d50dd637b3d83 100644 (file)
--- a/views/default/page/elements/sidebar_alt.php
+++ b/views/default/page/elements/sidebar_alt.php
@@ -1,4 +1,12 @@
 <?php 
 /**
  * Elgg secondary sidebar contents
+ *
+ * You can override, extend, or pass content to it
+ *
+ * @uses $vars['sidebar_alt] HTML content for the alternate sidebar
  */
+
+$sidebar = elgg_extract('sidebar_alt', $vars, '');
+
+echo $sidebar;

diff --git a/views/default/page/layouts/two_sidebar.php b/views/default/page/layouts/two_sidebar.php
index 4e0bab21b417658e112f858f82514e310c707e93..7521dd44f19c63bdc300a562034529441a00d57f 100644 (file)
--- a/views/default/page/layouts/two_sidebar.php
+++ b/views/default/page/layouts/two_sidebar.php
@@ -5,10 +5,10 @@
  * @package Elgg
  * @subpackage Core
  *
- * @uses $vars['content'] The content string for the main column
- * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
+ * @uses $vars['content']     The content string for the main column
+ * @uses $vars['sidebar']     Optional content that is displayed in the sidebar
  * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
- * @uses $vars['class']   Additional class to apply to layout
+ * @uses $vars['class']       Additional class to apply to layout
  */
 
 $class = 'elgg-layout elgg-layout-two-sidebar clearfix';
@@ -25,12 +25,7 @@ if (isset($vars['class'])) {
        </div>
        <div class="elgg-sidebar-alt">
                <?php
-                       //$params = $vars;
-                       //$params['sidebar'] = $vars['sidebar_alt'];
-                       $params = array(
-                               'sidebar' => elgg_view_module('test', 'Testing', 'Hello, world!'),
-                       );
-                       echo elgg_view('page/elements/sidebar_alt', $params);
+                       echo elgg_view('page/elements/sidebar_alt', $vars);
                ?>
        </div>