diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-11 01:36:23 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-11 01:36:23 +0000 |
| commit | 3bfa294985001c2c6ebb58fbf87b2f795e055ca5 (patch) | |
| tree | 0c1bef5f9afa3f08da345df333dc1a63ed3ffb21 /views/default/canvas/layouts/one_column_with_sidebar.php | |
| parent | 8c756908c5d72a53b1a4dda0901c8fb3d0191408 (diff) | |
| download | elgg-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/canvas/layouts/one_column_with_sidebar.php')
| -rw-r--r-- | views/default/canvas/layouts/one_column_with_sidebar.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php index dff45a452..046c49997 100644 --- a/views/default/canvas/layouts/one_column_with_sidebar.php +++ b/views/default/canvas/layouts/one_column_with_sidebar.php @@ -1,9 +1,12 @@ <?php /** - * Elgg 1 column with sidebar canvas layout + * Elgg 1 column with sidebar layout * * @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 */ ?> <div id="elgg_content" class="clearfix sidebar"> @@ -14,10 +17,14 @@ </div> <div id="elgg_page_contents" class="clearfix"> - <?php + <?php + // @todo deprecated so remove in Elgg 2.0 if (isset($vars['area1'])) { echo $vars['area1']; } + if (isset($vars['content'])) { + echo $vars['content']; + } ?> </div> </div> |