From d373ceafa4b799005d54b8a63a1677e31ddf9c23 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 26 Feb 2009 09:41:37 +0000 Subject: Closes #807: Removed echo on page_draw() git-svn-id: https://code.elgg.org/elgg/trunk@2955 36083f99-b078-4883-b0ff-0f9b5a30f544 --- account/forgotten_password.php | 2 +- account/register.php | 2 +- dashboard/latest.php | 2 +- engine/lib/elgglib.php | 2 +- entities/list.php | 2 +- friends/add.php | 2 +- friends/collections.php | 2 +- friends/edit.php | 2 +- friends/index.php | 2 +- friends/of.php | 2 +- index.php | 2 +- install.php | 2 +- mod/notifications/groups.php | 2 +- mod/notifications/index.php | 2 +- mod/reportedcontent/add.php | 2 +- mod/riverdashboard/index.php | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/account/forgotten_password.php b/account/forgotten_password.php index b83776167..e28609f08 100644 --- a/account/forgotten_password.php +++ b/account/forgotten_password.php @@ -15,7 +15,7 @@ if (!isloggedin()) { $body = elgg_view_title(elgg_echo('user:password:lost')) . elgg_view("account/forms/forgotten_password"); - echo page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column", $body)); + page_draw(elgg_echo('user:password:lost'), elgg_view_layout("one_column", $body)); } else { forward(); } diff --git a/account/register.php b/account/register.php index 5e7d74a6c..e781dc8ad 100644 --- a/account/register.php +++ b/account/register.php @@ -21,7 +21,7 @@ // If we're not logged in, display the registration page if (!isloggedin()) { - echo page_draw(elgg_echo('register'), elgg_view("account/forms/register", array('friend_guid' => $friend_guid, 'invitecode' => $invitecode))); + page_draw(elgg_echo('register'), elgg_view("account/forms/register", array('friend_guid' => $friend_guid, 'invitecode' => $invitecode))); // Otherwise, forward to the index page } else { forward(); diff --git a/dashboard/latest.php b/dashboard/latest.php index add01f209..3769bced2 100644 --- a/dashboard/latest.php +++ b/dashboard/latest.php @@ -24,7 +24,7 @@ $content = list_registered_entities(0,10,true,false,array('object','group')); set_context('latest'); $content = elgg_view_layout('two_column_left_sidebar', '', $title . $content); - echo page_draw(elgg_echo('content:latest'), $content); + page_draw(elgg_echo('content:latest'), $content); ?> \ No newline at end of file diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 3bb170be9..1b2629a22 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1701,7 +1701,7 @@ ob_end_clean(); // Wipe any existing output buffer $body = elgg_view("messages/exceptions/exception",array('object' => $exception)); - echo page_draw(elgg_echo('exception:title'), $body); + page_draw(elgg_echo('exception:title'), $body); } diff --git a/entities/list.php b/entities/list.php index c5f87433f..a24086404 100644 --- a/entities/list.php +++ b/entities/list.php @@ -16,6 +16,6 @@ $area2 = list_entities("","",0,10,false); set_context('entities'); $body = elgg_view_layout('two_column_left_sidebar',$area1, $area2); - echo page_draw("",$body); + page_draw("",$body); ?> \ No newline at end of file diff --git a/friends/add.php b/friends/add.php index fa68e28a7..74e81b8de 100644 --- a/friends/add.php +++ b/friends/add.php @@ -23,6 +23,6 @@ $body = elgg_view_layout('two_column_left_sidebar','', elgg_view_title(elgg_echo('friends:collections:add')) . $area2); // Draw it - echo page_draw(elgg_echo('friends:collections:add'),$body); + page_draw(elgg_echo('friends:collections:add'),$body); ?> \ No newline at end of file diff --git a/friends/collections.php b/friends/collections.php index 389be57b6..d8a85c18c 100644 --- a/friends/collections.php +++ b/friends/collections.php @@ -23,6 +23,6 @@ $body = elgg_view_layout('two_column_left_sidebar', '', elgg_view_title(elgg_echo('friends:collections')) . $area2); // Draw it - echo page_draw(elgg_echo('friends:collections'),$body); + page_draw(elgg_echo('friends:collections'),$body); ?> \ No newline at end of file diff --git a/friends/edit.php b/friends/edit.php index 3b0233df9..25dd5d4bf 100644 --- a/friends/edit.php +++ b/friends/edit.php @@ -34,6 +34,6 @@ $body = elgg_view_layout('two_column_left_sidebar',$area1. $area2); // Draw it - echo page_draw(elgg_echo('friends:add'),$body); + page_draw(elgg_echo('friends:add'),$body); ?> \ No newline at end of file diff --git a/friends/index.php b/friends/index.php index d363d7cf2..80a909890 100644 --- a/friends/index.php +++ b/friends/index.php @@ -21,6 +21,6 @@ $area2 = list_entities_from_relationship('friend',$owner->getGUID(),false,'user','',0,10,false); $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); - echo page_draw(sprintf(elgg_echo("friends:owned"),$owner->name),$body); + page_draw(sprintf(elgg_echo("friends:owned"),$owner->name),$body); ?> \ No newline at end of file diff --git a/friends/of.php b/friends/of.php index 2871eb35a..f1b060f20 100644 --- a/friends/of.php +++ b/friends/of.php @@ -21,6 +21,6 @@ $area2 = list_entities_from_relationship('friend',$owner->getGUID(),true,'user','',0,10,false); $body = elgg_view_layout('two_column_left_sidebar', '', $area1 . $area2); - echo page_draw(sprintf(elgg_echo("friends:of:owned"),$owner->name),$body); + page_draw(sprintf(elgg_echo("friends:of:owned"),$owner->name),$body); ?> \ No newline at end of file diff --git a/index.php b/index.php index 817e8b2a9..305d713a8 100644 --- a/index.php +++ b/index.php @@ -35,7 +35,7 @@ global $autofeed; $autofeed = false; $content = elgg_view_layout('two_column_left_sidebar', '', $title . $content, elgg_view("account/forms/login")); - echo page_draw(null, $content); + page_draw(null, $content); } diff --git a/install.php b/install.php index f4c9c6758..49c56fa3d 100644 --- a/install.php +++ b/install.php @@ -37,6 +37,6 @@ /** * Load the front page */ - echo page_draw(elgg_echo("installation:settings"), elgg_view_layout("one_column", elgg_view("settings/install"))); + page_draw(elgg_echo("installation:settings"), elgg_view_layout("one_column", elgg_view("settings/install"))); ?> \ No newline at end of file diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php index 733ba1d65..97adebb82 100644 --- a/mod/notifications/groups.php +++ b/mod/notifications/groups.php @@ -37,6 +37,6 @@ $body = elgg_view_layout('two_column_left_sidebar','',$body); // Draw the page - echo page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'),$body); + page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'),$body); ?> \ No newline at end of file diff --git a/mod/notifications/index.php b/mod/notifications/index.php index 670265753..a4d3ef880 100644 --- a/mod/notifications/index.php +++ b/mod/notifications/index.php @@ -34,6 +34,6 @@ $body = elgg_view_layout('two_column_left_sidebar','',$body); // Draw the page - echo page_draw(elgg_echo('notifications:subscriptions:changesettings'),$body); + page_draw(elgg_echo('notifications:subscriptions:changesettings'),$body); ?> \ No newline at end of file diff --git a/mod/reportedcontent/add.php b/mod/reportedcontent/add.php index 6ec4aeafb..ea282a3ea 100644 --- a/mod/reportedcontent/add.php +++ b/mod/reportedcontent/add.php @@ -31,6 +31,6 @@ $body = elgg_view_layout('two_column_left_sidebar', '', $area2); // Draw it - echo page_draw(elgg_echo('reportedcontent:add'),$body); + page_draw(elgg_echo('reportedcontent:add'),$body); ?> \ No newline at end of file diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php index 1afdb5bf4..552993899 100644 --- a/mod/riverdashboard/index.php +++ b/mod/riverdashboard/index.php @@ -65,7 +65,7 @@ )); if (empty($callback)) { $body .= elgg_view('riverdashboard/container', array('body' => $nav . $river . elgg_view('riverdashboard/js'))); - echo page_draw(elgg_echo('dashboard'),elgg_view_layout('sidebar_boxes',$area1,$body)); + page_draw(elgg_echo('dashboard'),elgg_view_layout('sidebar_boxes',$area1,$body)); } else { echo $nav . $river . elgg_view('riverdashboard/js'); } -- cgit v1.2.3