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

56 files changed, 61 insertions, 61 deletions

diff --git a/mod/blog/start.php b/mod/blog/start.php
index c61e818ad..1b2e31d03 100644
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -157,7 +157,7 @@ function blog_page_handler($page) {
 
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
 
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 }
 
 /**
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index ecfe61ae5..8e30f52dd 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -32,4 +32,4 @@ $area3 = elgg_view("bookmarks/bookmarklet");
 $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2, $area3);
 		
 // Draw it
-echo page_draw(elgg_echo('bookmarks:bookmarklet'),$body);
\ No newline at end of file
+echo elgg_view_page(elgg_echo('bookmarks:bookmarklet'),$body);
\ No newline at end of file
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index e65f7d179..92ee7e421 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -96,7 +96,7 @@ function bookmarks_page_handler($page) {
 		$content = elgg_echo("bookmarks:unknown_user");
 
 		$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-		echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
+		echo elgg_view_page(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
 
 		return FALSE;
 	}
@@ -240,7 +240,7 @@ function bookmarks_page_handler($page) {
 
 	$content = $header . $content;
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
-	echo page_draw(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
+	echo elgg_view_page(sprintf(elgg_echo("bookmarks:user"), elgg_get_page_owner()->name), $body);
 
 	return TRUE;
 }
diff --git a/mod/categories/listing.php b/mod/categories/listing.php
index 3a279a717..b2701b143 100644
--- a/mod/categories/listing.php
+++ b/mod/categories/listing.php
@@ -36,4 +36,4 @@ $content .= $objects;
 
 $body = elgg_view_layout('two_column_left_sidebar', '', $content);
 
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/mod/diagnostics/index.php b/mod/diagnostics/index.php
index e4620cb95..ca0f9b9f4 100644
--- a/mod/diagnostics/index.php
+++ b/mod/diagnostics/index.php
@@ -37,4 +37,4 @@ $body .= elgg_view('page_elements/elgg_content', array(
 );
 $body .= "</div>";
 // create page
-page_draw(elgg_echo('diagnostics'), elgg_view_layout("one_column_with_sidebar", $body));
+echo elgg_view_page(elgg_echo('diagnostics'), elgg_view_layout("one_column_with_sidebar", $body));
diff --git a/mod/ecml/start.php b/mod/ecml/start.php
index f4ca57365..2c6cc073b 100644
--- a/mod/ecml/start.php
+++ b/mod/ecml/start.php
@@ -88,7 +88,7 @@ function ecml_help_page_handler($page) {
 	if (!isset($page[0]) || empty($page[0])) {
 		$content = elgg_view('ecml/help');
 		$body = elgg_view_layout('one_column_with_sidebar', $content);
-		echo page_draw(elgg_echo('ecml:help'), $body);
+		echo elgg_view_page(elgg_echo('ecml:help'), $body);
 	} else {
 		// asking for detailed help about a keyword
 		$keyword = $page[0];
@@ -99,7 +99,7 @@ function ecml_help_page_handler($page) {
 			exit;
 		} else {
 			$body = elgg_view_layout('one_column_with_sidebar', $content);
-			echo page_draw(elgg_echo('ecml:help'), $body);
+			echo elgg_view_page(elgg_echo('ecml:help'), $body);
 		}
 	}
 
@@ -184,7 +184,7 @@ function ecml_admin_page_handler($page) {
 	set_context('admin');
 	$content = elgg_view('ecml/admin/ecml_admin');
 	$body = elgg_view_layout('one_column_with_sidebar', $content);
-	echo page_draw(elgg_echo('ecml:admin'), $body);
+	echo elgg_view_page(elgg_echo('ecml:admin'), $body);
 }
 
 /**
diff --git a/mod/file/edit.php b/mod/file/edit.php
index 8d091caa0..5c2afc120 100644
--- a/mod/file/edit.php
+++ b/mod/file/edit.php
@@ -35,4 +35,4 @@ $area1 = elgg_view_title($title);
 $area1 .= elgg_view("file/upload", array('entity' => $file));
 
 $body = elgg_view_layout('one_column_with_sidebar', $area1);
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 984aedc60..038d7efa2 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -35,5 +35,5 @@
 	$content = "<div class='files'>".$area1.$area2."</div>";
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/file/index.php b/mod/file/index.php
index 28ec07031..7fb246367 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -41,5 +41,5 @@
 	$content = "<div class='files'>".$area1.$area2."</div>";
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/file/search.php b/mod/file/search.php
index 221e34079..6568eae79 100644
--- a/mod/file/search.php
+++ b/mod/file/search.php
@@ -95,6 +95,6 @@
 		
 		$body = elgg_view_layout('one_column_with_sidebar', $content);
 		
-		page_draw($title, $body);
+		echo elgg_view_page($title, $body);
 
 ?>
\ No newline at end of file
diff --git a/mod/file/upload.php b/mod/file/upload.php
index a4cd4e01e..975b8e66a 100644
--- a/mod/file/upload.php
+++ b/mod/file/upload.php
@@ -19,6 +19,6 @@
 	$area1 .= elgg_view("file/upload", array('container_guid' => $container_guid));
 	$body = elgg_view_layout('one_column_with_sidebar', $area1);
 	
-	page_draw(elgg_echo("file:upload"), $body);
+	echo elgg_view_page(elgg_echo("file:upload"), $body);
 	
 ?>
\ No newline at end of file
diff --git a/mod/file/world.php b/mod/file/world.php
index e35b3c067..0fa2a2ead 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -34,4 +34,4 @@
 		
 	$body = elgg_view_layout('one_column_with_sidebar', $content, $area3);
 
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
diff --git a/mod/groups/activity.php b/mod/groups/activity.php
index d0e24be97..4f436cca7 100644
--- a/mod/groups/activity.php
+++ b/mod/groups/activity.php
@@ -54,4 +54,4 @@ $title = sprintf(elgg_echo("groups:activity"), elgg_get_page_owner()->name);
 $body = elgg_view_layout('one_column_with_sidebar', $area1);

 

 // Finally draw the page

-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/mod/groups/addtopic.php b/mod/groups/addtopic.php
index 8d62bf19f..85bef8ae5 100644
--- a/mod/groups/addtopic.php
+++ b/mod/groups/addtopic.php
@@ -17,4 +17,4 @@ $area2 = elgg_view("forms/forums/addtopic");
 $body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 		
 // Display page
-page_draw(elgg_echo('groups:addtopic'),$body);
\ No newline at end of file
+echo elgg_view_page(elgg_echo('groups:addtopic'),$body);
\ No newline at end of file
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 354437c7e..666c6ad4b 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -62,4 +62,4 @@
 	$body = elgg_view_layout('one_column_with_sidebar', $area1, $area2);
 
 	// Finally draw the page
-	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/mod/groups/edit.php b/mod/groups/edit.php
index 11880e4d6..ddaec0060 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -25,5 +25,5 @@
 	
 	$body = elgg_view_layout('one_column_with_sidebar', $body);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/edittopic.php b/mod/groups/edittopic.php
index 2c457f53b..03d220af0 100644
--- a/mod/groups/edittopic.php
+++ b/mod/groups/edittopic.php
@@ -22,4 +22,4 @@ $area2 = elgg_view("forms/forums/edittopic", array('entity' => $topic));
 $body = elgg_view_layout('one_column_with_sidebar', $area2);
 		
 // Display page
-page_draw(elgg_echo('groups:edittopic'),$body);
\ No newline at end of file
+echo elgg_view_page(elgg_echo('groups:edittopic'),$body);
\ No newline at end of file
diff --git a/mod/groups/forum.php b/mod/groups/forum.php
index d3e4a471c..603743009 100644
--- a/mod/groups/forum.php
+++ b/mod/groups/forum.php
@@ -42,4 +42,4 @@ $body = elgg_view_layout('one_column_with_sidebar', $area1);
 $title = elgg_echo('item:object:groupforumtopic');
 
 // Finally draw the page
-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/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index a64ca55db..ffa96d71d 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -47,5 +47,5 @@
 	}
 		
 	// Finally draw the page
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/index.php b/mod/groups/index.php
index 48ff99805..de1363ae6 100644
--- a/mod/groups/index.php
+++ b/mod/groups/index.php
@@ -23,5 +23,5 @@
 	$body = elgg_view_layout('one_column_with_sidebar', $area1);
 	
 	// Finally draw the page
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
diff --git a/mod/groups/invitations.php b/mod/groups/invitations.php
index 296f4318b..837534f99 100644
--- a/mod/groups/invitations.php
+++ b/mod/groups/invitations.php
@@ -28,4 +28,4 @@ if ($user) {
 
 $body = elgg_view_layout('one_column_with_sidebar', $area2);
 
-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/mod/groups/invite.php b/mod/groups/invite.php
index f76c469ca..48dfea58b 100644
--- a/mod/groups/invite.php
+++ b/mod/groups/invite.php
@@ -26,5 +26,5 @@
 	
 	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/membership.php b/mod/groups/membership.php
index ace899772..bfce96741 100644
--- a/mod/groups/membership.php
+++ b/mod/groups/membership.php
@@ -30,5 +30,5 @@
 	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
 	// Finally draw the page
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
diff --git a/mod/groups/membershipreq.php b/mod/groups/membershipreq.php
index 8ade60b2a..e37825e74 100644
--- a/mod/groups/membershipreq.php
+++ b/mod/groups/membershipreq.php
@@ -28,5 +28,5 @@
 	
 	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/new.php b/mod/groups/new.php
index 581a1d90d..4f8179e58 100644
--- a/mod/groups/new.php
+++ b/mod/groups/new.php
@@ -16,5 +16,5 @@
 	
 	$body = elgg_view_layout('one_column_with_sidebar', $area1.$area2);
 	
-	page_draw($title, $body);
+	echo elgg_view_page($title, $body);
 ?>
\ No newline at end of file
diff --git a/mod/groups/topicposts.php b/mod/groups/topicposts.php
index d3ba05ead..0673156f1 100644
--- a/mod/groups/topicposts.php
+++ b/mod/groups/topicposts.php
@@ -28,6 +28,6 @@
 	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
 		
 	// Display page
-		page_draw($topic->title,$body);
+		echo elgg_view_page($topic->title,$body);
 		
 ?>
\ No newline at end of file
diff --git a/mod/invitefriends/index.php b/mod/invitefriends/index.php
index b6e45f447..25935565a 100644
--- a/mod/invitefriends/index.php
+++ b/mod/invitefriends/index.php
@@ -16,4 +16,4 @@ set_page_owner(get_loggedin_userid());
 $body = elgg_view('invitefriends/form');
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
-page_draw(elgg_echo('friends:invite'), $body);
+echo elgg_view_page(elgg_echo('friends:invite'), $body);
diff --git a/mod/members/index.php b/mod/members/index.php
index e85817dec..589301ec6 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -77,4 +77,4 @@ $area2 .= elgg_view('page_elements/elgg_content', array('body' => elgg_view("mem
 $body = elgg_view_layout("one_column_with_sidebar", $area2, $area1);
 
 // Display page
-page_draw(sprintf(elgg_echo('members:members'), $page_owner->name), $body);
\ No newline at end of file
+echo elgg_view_page(sprintf(elgg_echo('members:members'), $page_owner->name), $body);
\ No newline at end of file
diff --git a/mod/messageboard/history.php b/mod/messageboard/history.php
index 4b608bfc0..ca0584ccc 100644
--- a/mod/messageboard/history.php
+++ b/mod/messageboard/history.php
@@ -28,4 +28,4 @@ $area2 .= elgg_view("messageboard/messageboard", array('annotation' => $contents
 $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
 
 // Display page
-page_draw(elgg_echo('messageboard:history:title'),$body);
+echo elgg_view_page(elgg_echo('messageboard:history:title'),$body);
diff --git a/mod/messageboard/index.php b/mod/messageboard/index.php
index ff661ce9c..816f9480f 100644
--- a/mod/messageboard/index.php
+++ b/mod/messageboard/index.php
@@ -30,5 +30,5 @@ if (isloggedin()) {
 $body = elgg_view_layout("two_column_left_sidebar", '', $area2);
 
 // Display page
-page_draw(sprintf(elgg_echo('messageboard:user'),$entity->name),$body);
+echo elgg_view_page(sprintf(elgg_echo('messageboard:user'),$entity->name),$body);
 
diff --git a/mod/messages/index.php b/mod/messages/index.php
index 0f793a9f6..5f4a483be 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -46,4 +46,4 @@ $body = elgg_view_layout("one_column_with_sidebar", $area2);
 
 
 // Draw page
-page_draw(sprintf(elgg_echo('messages:user'),$page_owner->name),$body);
+echo elgg_view_page(sprintf(elgg_echo('messages:user'),$page_owner->name),$body);
diff --git a/mod/messages/read.php b/mod/messages/read.php
index da6ed0032..2bbae1c71 100644
--- a/mod/messages/read.php
+++ b/mod/messages/read.php
@@ -51,4 +51,4 @@ $sidebar = elgg_view("messages/menu_options");
 $body = elgg_view_layout("one_column_with_sidebar", $content, $sidebar);
 
 // Display page
-page_draw(sprintf(elgg_echo('messages:message')),$body);
\ No newline at end of file
+echo elgg_view_page(sprintf(elgg_echo('messages:message')),$body);
\ No newline at end of file
diff --git a/mod/messages/send.php b/mod/messages/send.php
index c0a59b289..92563c91d 100644
--- a/mod/messages/send.php
+++ b/mod/messages/send.php
@@ -35,4 +35,4 @@ $area3 = elgg_view("messages/menu_options");
 $body = elgg_view_layout("one_column_with_sidebar", $area2, $area3);
 
 // Draw page
-page_draw(sprintf(elgg_echo('messages:send'),$page_owner->name),$body);
\ No newline at end of file
+echo elgg_view_page(sprintf(elgg_echo('messages:send'),$page_owner->name),$body);
\ No newline at end of file
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 24aa721cf..e2b22502d 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -37,4 +37,4 @@ $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_vie
 $body = elgg_view_layout("one_column_with_sidebar", $area2);
 
 // Draw page
-page_draw(sprintf(elgg_echo('messages:sentMessages'),$page_owner->name),$body);
+echo elgg_view_page(sprintf(elgg_echo('messages:sentMessages'),$page_owner->name),$body);
diff --git a/mod/notifications/groups.php b/mod/notifications/groups.php
index c4329f128..baa8757a8 100644
--- a/mod/notifications/groups.php
+++ b/mod/notifications/groups.php
@@ -33,4 +33,4 @@ $body = elgg_view('input/form',array(
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
 
-page_draw(elgg_echo('notifications:subscriptions:changesettings:groups'), $body);
+echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings:groups'), $body);
diff --git a/mod/notifications/index.php b/mod/notifications/index.php
index 904b6f9ff..0418e6b1d 100644
--- a/mod/notifications/index.php
+++ b/mod/notifications/index.php
@@ -31,4 +31,4 @@ $body = elgg_view('notifications/subscriptions/form', array('people' => $people)
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
 
-page_draw(elgg_echo('notifications:subscriptions:changesettings'), $body);
+echo elgg_view_page(elgg_echo('notifications:subscriptions:changesettings'), $body);
diff --git a/mod/pages/edit.php b/mod/pages/edit.php
index 30207a7b9..d404e0433 100644
--- a/mod/pages/edit.php
+++ b/mod/pages/edit.php
@@ -33,4 +33,4 @@ if ($pages && ($pages->canEdit())) {
 
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
-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/mod/pages/history.php b/mod/pages/history.php
index 9228a65a9..6070a3fd0 100644
--- a/mod/pages/history.php
+++ b/mod/pages/history.php
@@ -36,4 +36,4 @@ $sidebar = elgg_view('pages/sidebar/tree');
 
 $body = elgg_view_layout('one_column_with_sidebar', $content, $sidebar);
 
-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/mod/pages/index.php b/mod/pages/index.php
index 7e48c06d8..3cffbd292 100644
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -51,4 +51,4 @@ $body .= $objects;
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
 // Finally draw the page
-page_draw($title, $body);
+echo elgg_view_page($title, $body);
diff --git a/mod/pages/new.php b/mod/pages/new.php
index 2674daf16..0d467d449 100644
--- a/mod/pages/new.php
+++ b/mod/pages/new.php
@@ -36,4 +36,4 @@ $area2 .= elgg_view("forms/pages/edit");
 
 $body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
 
-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/mod/pages/view.php b/mod/pages/view.php
index 6eb58ed8e..84b0ae55b 100644
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -58,4 +58,4 @@ $sidebar = elgg_view('pages/sidebar/tree');
 $body = elgg_view_layout('one_column_with_sidebar', $body, $sidebar);
 
 // Finally draw the page
-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/mod/pages/welcome.php b/mod/pages/welcome.php
index 41fa87aa1..4386c5228 100644
--- a/mod/pages/welcome.php
+++ b/mod/pages/welcome.php
@@ -32,4 +32,4 @@ $area2 .= elgg_view("forms/pages/editwelcome", array('entity' => $welcome_messag
 
 $body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
 
-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/mod/pages/world.php b/mod/pages/world.php
index f423bf8d5..ee9521ba4 100644
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -45,4 +45,4 @@ $body .= $objects;
 $body = elgg_view_layout('one_column_with_sidebar', $body);
 
 // Finally draw the page
-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/mod/profile/edit.php b/mod/profile/edit.php
index 97b656a5c..c6fc154ac 100644
--- a/mod/profile/edit.php
+++ b/mod/profile/edit.php
@@ -37,4 +37,4 @@ set_context('profile_edit');
 $body = elgg_view_layout("one_column_with_sidebar", $area1);
 	
 // Draw the page
-page_draw(elgg_echo("profile:edit"),$body);
+echo elgg_view_page(elgg_echo("profile:edit"),$body);
diff --git a/mod/profile/editicon.php b/mod/profile/editicon.php
index 9b0a654d2..e3adef13f 100644
--- a/mod/profile/editicon.php
+++ b/mod/profile/editicon.php
@@ -36,4 +36,4 @@ set_context('profile_edit');
 $body = elgg_view_layout("one_column_with_sidebar", $area1);
 	
 // Draw the page
-page_draw(elgg_echo("profile:editicon"), $body);
+echo elgg_view_page(elgg_echo("profile:editicon"), $body);
diff --git a/mod/profile/index.php b/mod/profile/index.php
index 22393df71..bf47d670c 100644
--- a/mod/profile/index.php
+++ b/mod/profile/index.php
@@ -46,4 +46,4 @@ if ($user = get_user_by_username($username)) {
 	$title = elgg_echo("profile");
 }
 $body = elgg_view_layout("one_column", $body);
-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/mod/profile/start.php b/mod/profile/start.php
index 3b97001fb..6cebf88c0 100644
--- a/mod/profile/start.php
+++ b/mod/profile/start.php
@@ -160,7 +160,7 @@ function profile_page_handler($page) {
 			break;
 	}
 
-	page_draw($title, $content);
+	echo elgg_view_page($title, $content);
 	return;
 }
 
diff --git a/mod/reportedcontent/add.php b/mod/reportedcontent/add.php
index 9a377b2d3..833ff38d1 100644
--- a/mod/reportedcontent/add.php
+++ b/mod/reportedcontent/add.php
@@ -26,4 +26,4 @@ $area3 .= elgg_echo('reportedcontent:warning');
 $body = elgg_view_layout('one_column_with_sidebar', $area2, $area3);
 
 // Draw it
-page_draw(elgg_echo('reportedcontent:this'),$body);
\ No newline at end of file
+echo elgg_view_page(elgg_echo('reportedcontent:this'),$body);
\ No newline at end of file
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index e0aa21b1b..153e6a75c 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -59,7 +59,7 @@ set_context('riverdashboard');
 
 if (empty($callback)) {
 	$body .= elgg_view('riverdashboard/container', array('body' => $nav . $extend . $river . elgg_view('riverdashboard/js')));
-	page_draw($title_wording,elgg_view_layout('one_column_with_sidebar', $title . $body, $sidebar));
+	echo elgg_view_page($title_wording,elgg_view_layout('one_column_with_sidebar', $title . $body, $sidebar));
 } else {
 	header("Content-type: text/html; charset=UTF-8");
 	echo $nav . $river . elgg_view('riverdashboard/js');
diff --git a/mod/search/index.php b/mod/search/index.php
index 705f6e0a8..c68fb4a0f 100644
--- a/mod/search/index.php
+++ b/mod/search/index.php
@@ -140,7 +140,7 @@ if (!$query) {
 	$body .= elgg_view('page_elements/elgg_content', array('body' => elgg_echo('search:no_query')));
 
 	$layout = elgg_view_layout('one_column_with_sidebar', $body);
-	page_draw($title, $layout);
+	echo elgg_view_page($title, $layout);
 
 	return;
 }
@@ -260,4 +260,4 @@ $layout = elgg_view($layout_view, array('params' => $params, 'body' => $body));
 
 $title = sprintf(elgg_echo('search:results'), "\"{$params['query']}\"");
 
-page_draw($title, $layout);
+echo elgg_view_page($title, $layout);
diff --git a/mod/sitepages/index.php b/mod/sitepages/index.php
index ff21ec97f..5b575ef37 100644
--- a/mod/sitepages/index.php
+++ b/mod/sitepages/index.php
@@ -36,4 +36,4 @@ $sidebar = elgg_view('sitepages/sidebar');
 $sidebar .= elgg_view('sitepages/members', array('members' => $members));

 		

 $content = elgg_view_layout('frontpage', $content, $sidebar);

-page_draw(null, $content);

+echo elgg_view_page(null, $content);

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index ea996e099..fb562b631 100644
--- a/mod/sitepages/start.php
+++ b/mod/sitepages/start.php
@@ -73,7 +73,7 @@ function sitepages_custom_index() {
 	//set_context('sitepages:front');
 
 	//if ($contents = elgg_view('sitepages/custom_frontpage')) {
-	//	page_draw(FALSE, $contents);
+	//	echo elgg_view_page(FALSE, $contents);
 
 	//	set_context($context);
 		// return TRUE to tell index.php we've got its content right here.
@@ -136,7 +136,7 @@ function sitepages_page_handler($page) {
 			break;
 	}
 
-	page_draw($title, $content);
+	echo elgg_view_page($title, $content);
 }
 
 
diff --git a/mod/tagcloud/tagcloud.php b/mod/tagcloud/tagcloud.php
index f5cd3e7ae..a0bc1502f 100644
--- a/mod/tagcloud/tagcloud.php
+++ b/mod/tagcloud/tagcloud.php
@@ -13,4 +13,4 @@ $tags = display_tagcloud(0, 100, 'tags');
 $body = elgg_view_layout("one_column_with_sidebar", $title . $tags, $sidebar);
 		
 // Display page
-page_draw(sprintf(elgg_echo('tagcloud:site:title'),$page_owner->name),$body);
\ No newline at end of file
+echo elgg_view_page(sprintf(elgg_echo('tagcloud:site:title'),$page_owner->name),$body);
\ No newline at end of file
diff --git a/mod/thewire/add.php b/mod/thewire/add.php
index f224d900a..3b71cc1d6 100644
--- a/mod/thewire/add.php
+++ b/mod/thewire/add.php
@@ -20,6 +20,6 @@
 	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
 		
 	// Display page
-		page_draw(elgg_echo('thewire:addpost'),$body);
+		echo elgg_view_page(elgg_echo('thewire:addpost'),$body);
 		
 ?>
\ No newline at end of file
diff --git a/mod/thewire/everyone.php b/mod/thewire/everyone.php
index e226e681b..74293d26f 100644
--- a/mod/thewire/everyone.php
+++ b/mod/thewire/everyone.php
@@ -21,6 +21,6 @@
 	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
 		
 	// Display page
-		page_draw(elgg_echo('thewire:everyone'),$body);
+		echo elgg_view_page(elgg_echo('thewire:everyone'),$body);
 		
 ?>
diff --git a/mod/thewire/index.php b/mod/thewire/index.php
index 61eb9ef4a..41b8969aa 100644
--- a/mod/thewire/index.php
+++ b/mod/thewire/index.php
@@ -33,6 +33,6 @@
 	    $body = elgg_view_layout("one_column_with_sidebar", $area2);
 		
 	// Display page
-		page_draw(sprintf(elgg_echo('thewire:user'),$page_owner->name),$body);
+		echo elgg_view_page(sprintf(elgg_echo('thewire:user'),$page_owner->name),$body);
 		
 ?>
\ No newline at end of file