layout views should use 'content' to support alternate viewtypes (like rss) - updated...

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

diff --git a/pages/members/search.php b/pages/members/search.php
index 1a01686607d7092ebe0f2848e875e4f6a214d530..f21f72fc4db245d5478600881373c6f5c2772743 100644 (file)
--- a/pages/members/search.php
+++ b/pages/members/search.php
@@ -30,7 +30,7 @@ if ($vars['search_type'] == 'tag') {
 }
 
 $params = array(
-       'body' => $content,
+       'content' => $content,
        'sidebar' => elgg_view('core/members/sidebar'),
 );
 

diff --git a/views/default/layout/shells/content.php b/views/default/layout/shells/content.php
index 787445fd172b6c3c3104ef77568716cfb156463d..87d314b2c114a970863eafe29f9c441b2794bdd0 100644 (file)
--- 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 4c98c31d16be2abc0615935a76cd4336f182d75b..c6108864183ab00c49f9e384e29ef2f6e02252e5 100644 (file)
--- 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>