Fixes #2360: page_draw => elgg_view_page in core + bundled plugins

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

14 files changed, 14 insertions, 14 deletions

diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index 546dbfd62..3fb629ef6 100644
--- a/pages/account/forgotten_password.php
+++ b/pages/account/forgotten_password.php
@@ -12,7 +12,7 @@ if (!isloggedin()) {
 	$area1 = elgg_view_title(elgg_echo("user:password:lost"));
 	$area2 = elgg_view("account/forms/forgotten_password");
 	$content = elgg_view_layout("one_column_with_sidebar", $area1 . $area2);
-	page_draw(elgg_echo('user:password:lost'), $content);
+	echo elgg_view_page(elgg_echo('user:password:lost'), $content);
 } else {
 	forward();
 }
\ No newline at end of file
diff --git a/pages/account/register.php b/pages/account/register.php
index 2500d11fc..2638ef561 100644
--- a/pages/account/register.php
+++ b/pages/account/register.php
@@ -38,7 +38,7 @@ if (!isloggedin()) {
 	$area2 = elgg_view("account/forms/register",
 		array('friend_guid' => $friend_guid, 'invitecode' => $invitecode));
 
-	page_draw(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
+	echo elgg_view_page(elgg_echo("register"), elgg_view_layout("one_column_with_sidebar", $area1 . $area2));
 
 	// Otherwise, forward to the index page
 } else {
diff --git a/pages/dashboard/index.php b/pages/dashboard/index.php
index 6fbbec035..60a3bd17c 100644
--- a/pages/dashboard/index.php
+++ b/pages/dashboard/index.php
@@ -20,4 +20,4 @@ $intro_message = elgg_view('dashboard/blurb');
 // Try and get the user from the username and set the page body accordingly
 $body = elgg_view_layout('widgets', "", "", $intro_message);
 
-page_draw($title, $body);
\ No newline at end of file
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/pages/dashboard/latest.php b/pages/dashboard/latest.php
index 3c81207f0..6dab598a1 100644
--- a/pages/dashboard/latest.php
+++ b/pages/dashboard/latest.php
@@ -24,4 +24,4 @@ if (is_plugin_enabled('riverdashboard')) {
 	$content = "Riverdashboard not loaded";
 }
 $content = elgg_view_layout('one_column_with_sidebar', $title . $content);
-page_draw(elgg_echo('content:latest'), $content);
+echo elgg_view_page(elgg_echo('content:latest'), $content);
diff --git a/pages/entities/index.php b/pages/entities/index.php
index bbd110689..a79e0314d 100644
--- a/pages/entities/index.php
+++ b/pages/entities/index.php
@@ -48,7 +48,7 @@ if ($entity = get_entity($guid)) {
 
 // Display the page
 if ($shell) {
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 } else {
 	header("Content-type: text/html; charset=UTF-8");
 	echo $title;
diff --git a/pages/entities/list.php b/pages/entities/list.php
index 0eb55286b..d43e6c25d 100644
--- a/pages/entities/list.php
+++ b/pages/entities/list.php
@@ -12,4 +12,4 @@ set_context('entities');
 
 $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
 
-page_draw("", $body);
\ No newline at end of file
+echo elgg_view_page("", $body);
\ No newline at end of file
diff --git a/pages/friends/add.php b/pages/friends/add.php
index 34944d624..5eb6608a6 100644
--- a/pages/friends/add.php
+++ b/pages/friends/add.php
@@ -20,4 +20,4 @@ $content .= elgg_view('friends/forms/edit', array(
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw(elgg_echo('friends:collections:add'), $body);
+echo elgg_view_page(elgg_echo('friends:collections:add'), $body);
diff --git a/pages/friends/collections.php b/pages/friends/collections.php
index 9cf0c58a6..a37ba3a43 100644
--- a/pages/friends/collections.php
+++ b/pages/friends/collections.php
@@ -17,4 +17,4 @@ $content .= elgg_view_access_collections(get_loggedin_userid());
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/pages/friends/edit.php b/pages/friends/edit.php
index ddc7f9650..a56009472 100644
--- a/pages/friends/edit.php
+++ b/pages/friends/edit.php
@@ -27,4 +27,4 @@ $content .= elgg_view('friends/forms/edit', array('collection' => $collection,
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw($title, $body);
\ No newline at end of file
+echo elgg_view_page($title, $body);
\ No newline at end of file
diff --git a/pages/friends/index.php b/pages/friends/index.php
index e9ff87c16..4e379cae4 100644
--- a/pages/friends/index.php
+++ b/pages/friends/index.php
@@ -23,4 +23,4 @@ $content .= "<div class='members_list'>"
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/pages/friends/of.php b/pages/friends/of.php
index 0e09e09f0..19806786e 100644
--- a/pages/friends/of.php
+++ b/pages/friends/of.php
@@ -23,4 +23,4 @@ $content .= "<div class='members_list'>"
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/pages/settings/plugins.php b/pages/settings/plugins.php
index a768e69d7..671d0ff2c 100644
--- a/pages/settings/plugins.php
+++ b/pages/settings/plugins.php
@@ -20,4 +20,4 @@ $content .= elgg_view("usersettings/plugins",
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw(elgg_echo("usersettings:plugins"), $body);
+echo elgg_view_page(elgg_echo("usersettings:plugins"), $body);
diff --git a/pages/settings/statistics.php b/pages/settings/statistics.php
index 38b0094ee..248dc8e50 100644
--- a/pages/settings/statistics.php
+++ b/pages/settings/statistics.php
@@ -19,4 +19,4 @@ $content .= elgg_view("usersettings/statistics");
 
 $body = elgg_view_layout('one_column_with_sidebar', $content);
 
-page_draw(elgg_echo("usersettings:statistics"), $body);
+echo elgg_view_page(elgg_echo("usersettings:statistics"), $body);
diff --git a/pages/settings/user.php b/pages/settings/user.php
index 62a3bb1ba..6fd578ac9 100644
--- a/pages/settings/user.php
+++ b/pages/settings/user.php
@@ -19,4 +19,4 @@ $content .= elgg_view("usersettings/form");
 
 $body = elgg_view_layout("one_column_with_sidebar", $content);
 
-page_draw(elgg_echo("usersettings:user"), $body);
+echo elgg_view_page(elgg_echo("usersettings:user"), $body);