diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-29 22:05:01 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-29 22:05:01 +0000 |
| commit | 67d881e0dc3098800038127441836189f84b4322 (patch) | |
| tree | 52dd22ea0e818e0c9ec79de05743ba9bf7a36fe6 | |
| parent | d276934f6d90134a96b57d22d69ecedd29e6d03a (diff) | |
| download | elgg-67d881e0dc3098800038127441836189f84b4322.tar.gz elgg-67d881e0dc3098800038127441836189f84b4322.tar.bz2 | |
Fixes #2241 - removed direct calls to the content wrapper view and removed the view as it is been replaced by a body view
git-svn-id: http://code.elgg.org/elgg/trunk@7759 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | mod/diagnostics/index.php | 8 | ||||
| -rw-r--r-- | mod/search/index.php | 3 | ||||
| -rw-r--r-- | mod/sitepages/sitepages_functions.php | 4 | ||||
| -rw-r--r-- | views/default/page/elements/content.php | 14 |
4 files changed, 5 insertions, 24 deletions
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php index 4f746c1c1..1ef9e5344 100644 --- a/mod/diagnostics/index.php +++ b/mod/diagnostics/index.php @@ -13,9 +13,7 @@ elgg_set_context('admin'); // system diagnostics $content = elgg_view_title(elgg_echo('diagnostics')); $content .= "<div class='admin_settings diagnostics'>"; -$content .= elgg_view('page/elements/content', array('body' => - "<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download')) -); +$content .= "<h3>".elgg_echo('diagnostics:report')."</h3>".elgg_echo('diagnostics:description') . elgg_view('diagnostics/forms/download'); // unit tests $content .= "<h3>".elgg_echo('diagnostics:unittester')."</h3>"; @@ -32,9 +30,7 @@ if (isset($CONFIG->debug)) { $test_body .= elgg_echo('diagnostics:unittester:debug'); } -$content .= elgg_view('page/elements/content', array( - 'body' => $test_body) -); +$content .= $test_body; $content .= "</div>"; $body = elgg_view_layout("one_column_with_sidebar", array('content' => $content)); diff --git a/mod/search/index.php b/mod/search/index.php index 4e73b78ae..82182dd75 100644 --- a/mod/search/index.php +++ b/mod/search/index.php @@ -137,8 +137,7 @@ foreach ($custom_types as $type) { // check that we have an actual query if (!$query) { $body = elgg_view_title(elgg_echo('search:search_error')); - $body .= elgg_view('page/elements/content', array('body' => elgg_echo('search:no_query'))); - + $body .= elgg_echo('search:no_query'); $layout = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); echo elgg_view_page($title, $layout); diff --git a/mod/sitepages/sitepages_functions.php b/mod/sitepages/sitepages_functions.php index 3a6c10359..5e696e4c9 100644 --- a/mod/sitepages/sitepages_functions.php +++ b/mod/sitepages/sitepages_functions.php @@ -92,9 +92,9 @@ function sitepages_get_page_content($page_type) { $sitepage = sitepages_get_sitepage_object($page_type); if ($sitepage) { - $body .= elgg_view('page/elements/content', array('body' => $sitepage->description)); + $body .= $sitepage->description; } else { - $body .= elgg_view('page/elements/content', array('body' => elgg_echo('sitepages:notset'))); + $body .= elgg_echo('sitepages:notset'); } $content = elgg_view_layout('one_column_with_sidebar', array('content' => $body)); diff --git a/views/default/page/elements/content.php b/views/default/page/elements/content.php deleted file mode 100644 index f82720c2f..000000000 --- a/views/default/page/elements/content.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php -/** - * Elgg content wrapper - * - * @uses $vars['body'] The main content HTML - */ - -$body = elgg_get_array_value('body', $vars, ''); - -echo <<<HTML -<div class="elgg-page-body"> - $body -</div> -HTML; |