diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-08 02:06:28 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-04-08 02:06:28 +0000 |
| commit | 092b5fdcbf81a63cbaca1cfb5654a07afb8266c2 (patch) | |
| tree | 3f0761a476c1da59a04c60b2fc9959f3a6f2127b | |
| parent | a04f6391bf7444a370380639ea496dce39377652 (diff) | |
| download | elgg-092b5fdcbf81a63cbaca1cfb5654a07afb8266c2.tar.gz elgg-092b5fdcbf81a63cbaca1cfb5654a07afb8266c2.tar.bz2 | |
Fixes #3319 alternate sidebar should work now
git-svn-id: http://code.elgg.org/elgg/trunk@8954 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | views/default/page/elements/sidebar_alt.php | 8 | ||||
| -rw-r--r-- | views/default/page/layouts/two_sidebar.php | 13 |
2 files changed, 12 insertions, 9 deletions
diff --git a/views/default/page/elements/sidebar_alt.php b/views/default/page/elements/sidebar_alt.php index 41982539e..6d91ca58b 100644 --- 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 4e0bab21b..7521dd44f 100644 --- 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> |