aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-16 02:16:45 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-16 02:16:45 +0000
commit2c443c0f84c10b19324f6be584e46efe71d0bf84 (patch)
tree4dd5bf2727e1b794515aac2bae039eb6e85f8ce2 /views/default
parentfcc68792fd00a2778746f6813efd0a5d879584d6 (diff)
downloadelgg-2c443c0f84c10b19324f6be584e46efe71d0bf84.tar.gz
elgg-2c443c0f84c10b19324f6be584e46efe71d0bf84.tar.bz2
layout views should use 'content' to support alternate viewtypes (like rss) - updated the one_sidebar view
git-svn-id: http://code.elgg.org/elgg/trunk@7641 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default')
-rw-r--r--views/default/layout/shells/content.php2
-rw-r--r--views/default/layout/shells/one_sidebar.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php
index 787445fd1..87d314b2c 100644
--- a/views/default/layout/shells/content.php
+++ b/views/default/layout/shells/content.php
@@ -48,7 +48,7 @@ $footer = elgg_view('layout/shells/content/footer', $params);
$body = $nav . $header . $filter . $content . $footer;
$params = array(
- 'body' => $body,
+ 'content' => $body,
'sidebar' => $sidebar,
);
if (isset($vars['class'])) {
diff --git a/views/default/layout/shells/one_sidebar.php b/views/default/layout/shells/one_sidebar.php
index 4c98c31d1..c61088641 100644
--- a/views/default/layout/shells/one_sidebar.php
+++ b/views/default/layout/shells/one_sidebar.php
@@ -5,7 +5,7 @@
* @package Elgg
* @subpackage Core
*
- * @uses $vars['body'] Content HTML for the main column
+ * @uses $vars['content'] Content HTML for the main column
* @uses $vars['sidebar'] Optional content that is displayed in the sidebar
* @uses $vars['class'] Additional class to apply to layout
*/
@@ -30,8 +30,8 @@ if (isset($vars['class'])) {
if (isset($vars['area1'])) {
echo $vars['area1'];
}
- if (isset($vars['body'])) {
- echo $vars['body'];
+ if (isset($vars['content'])) {
+ echo $vars['content'];
}
?>
</div>