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

8 files changed, 10 insertions, 10 deletions

diff --git a/engine/handlers/xml-rpc_handler.php b/engine/handlers/xml-rpc_handler.php
index 996400647..2454c83bc 100644
--- a/engine/handlers/xml-rpc_handler.php
+++ b/engine/handlers/xml-rpc_handler.php
@@ -42,4 +42,4 @@ if (!($result instanceof XMLRPCResponse)) {
 }
 
 // Output result
-page_draw("XML-RPC", elgg_view("xml-rpc/output", array('result' => $result)));
\ No newline at end of file
+echo elgg_view_page("XML-RPC", elgg_view("xml-rpc/output", array('result' => $result)));
\ No newline at end of file
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index 0db58f680..595a3aa7c 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -212,7 +212,7 @@ function admin_settings_page_handler($page) {
 	}
 
 	$body = elgg_view_layout('administration', $content);
-	page_draw($title, $body, 'page_shells/admin');
+	echo elgg_view_page($title, $body, 'page_shells/admin');
 }
 
 /**
diff --git a/engine/lib/api.php b/engine/lib/api.php
index fa7c17d80..a2b80625c 100644
--- a/engine/lib/api.php
+++ b/engine/lib/api.php
@@ -1253,7 +1253,7 @@ function _php_api_exception_handler($exception) {
 	$code   = $exception->getCode() == 0 ? ErrorResult::$RESULT_FAIL : $exception->getCode();
 	$result = new ErrorResult($exception->getMessage(), $code, NULL);
 
-	page_draw($exception->getMessage(), elgg_view("api/output", array("result" => $result)));
+	echo elgg_view_page($exception->getMessage(), elgg_view("api/output", array("result" => $result)));
 }
 
 
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 3f12bd10f..7dd485227 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1064,7 +1064,7 @@ function _elgg_php_exception_handler($exception) {
 
 	elgg_set_viewtype('failsafe');
 	$body = elgg_view("messages/exceptions/exception", array('object' => $exception));
-	page_draw(elgg_echo('exception:title'), $body);
+	echo elgg_view_page(elgg_echo('exception:title'), $body);
 }
 
 /**
@@ -2117,7 +2117,7 @@ function js_page_handler($page) {
 function elgg_walled_garden_index() {
 	$login = elgg_view('account/forms/login_walled_garden');
 
-	page_draw('', $login, 'page_shells/walled_garden');
+	echo elgg_view_page('', $login, 'page_shells/walled_garden');
 
 	// @hack Index must exit to keep plugins from continuing to extend
 	exit;
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
index 02c8e433c..68cfee940 100644
--- a/engine/lib/tags.php
+++ b/engine/lib/tags.php
@@ -441,7 +441,7 @@ function elgg_tagcloud_page_handler($page) {
 			$tags = display_tagcloud(0, 100, 'tags');
 			$body = elgg_view_layout('one_column_with_sidebar', $title . $tags);
 
-			page_draw(elgg_echo('tags:site_cloud'), $body);
+			echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
 			break;
 	}
 }
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 7632a4834..e76702fb2 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -978,7 +978,7 @@ function elgg_user_resetpassword_page_handler($page) {
 	$title = elgg_echo('resetpassword');
 	$content = elgg_view_title(elgg_echo('resetpassword')) . $form;
 
-	page_draw($title, elgg_view_layout('one_column', $content));
+	echo elgg_view_page($title, elgg_view_layout('one_column', $content));
 }
 
 /**
@@ -1332,7 +1332,7 @@ function elgg_user_login_page_handler() {
 	' .	elgg_view('account/forms/login') . '
 	</div>
 	';
-	page_draw('test', $content);
+	echo elgg_view_page('test', $content);
 }
 
 /**
diff --git a/engine/lib/xml-rpc.php b/engine/lib/xml-rpc.php
index 70eb627d8..251d470a1 100644
--- a/engine/lib/xml-rpc.php
+++ b/engine/lib/xml-rpc.php
@@ -193,5 +193,5 @@ function _php_xmlrpc_exception_handler($exception) {
 
 	$content = elgg_view("xml-rpc/output", $vars);
 
-	page_draw($exception->getMessage(), $content);
+	echo elgg_view_page($exception->getMessage(), $content);
 }
diff --git a/engine/tests/ui/submenu.php b/engine/tests/ui/submenu.php
index fcf4589e2..ac861254b 100644
--- a/engine/tests/ui/submenu.php
+++ b/engine/tests/ui/submenu.php
@@ -94,4 +94,4 @@ elgg_add_submenu_item(array('text' => 'All test', 'href' => "$url?all"), 'all');
 //set_context('not_main');
 
 $body = elgg_view_layout('one_column_with_sidebar', 'Look right.');
-page_draw('Submenu Test', $body);
+echo elgg_view_page('Submenu Test', $body);