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

diff --git a/engine/handlers/xml-rpc_handler.php b/engine/handlers/xml-rpc_handler.php
index 996400647dab996cc9ce7fe9ae653d259aa79f06..2454c83bc527bb9a1a8da6880af90921e6fde0e4 100644 (file)
--- 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 0db58f680eb1b4bd47092bbcc25b4cb4a887f9ce..595a3aa7c6cde8816e6c4b19ef02d7250157e037 100644 (file)
--- 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 fa7c17d8012f71361ceb90bc5f74f5c927cde8b6..a2b80625c8e832f6d06518c3c6f9aae07a75cb2e 100644 (file)
--- 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 3f12bd10f8cb1472b15081e734aa6f87158fdbbb..7dd4852273fb3e19930263ee9b5cc25fd87eb26c 100644 (file)
--- 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 02c8e433ce4bb4f43a5ec52ef29673e35e074a29..68cfee940524eb900c670acfe9b850f40bf25bc8 100644 (file)
--- 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 7632a4834820778e698b90a93fc85271faa5490d..e76702fb2151803f41dde585ea99e11c5ed6a925 100644 (file)
--- 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 70eb627d8553665d5ff598f76db1f18a2eb0e77b..251d470a1e3cdf88be65378a8fb90f0da1676214 100644 (file)
--- 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 fcf4589e24f5afa6f4e3761634ba093c3eec767d..ac861254b40bbb6f61339623600fd08bc1ac839c 100644 (file)
--- 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);

diff --git a/index.php b/index.php
index 833bab98ec94e7c08cd907da16c242091419cb55..014721954d8dfeea111d6e62763d6f26c08535c4 100644 (file)
--- a/index.php
+++ b/index.php
@@ -52,5 +52,5 @@ if (!trigger_plugin_hook('index', 'system', null, FALSE)) {
        $login_form = elgg_view('account/forms/login');
 
        $content = elgg_view_layout('one_column_with_sidebar', $title . $activity, $login_form);
-       page_draw(null, $content);
+       echo elgg_view_page(null, $content);
 }

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 8f7e7eb8f9d3a2be26b282a1cacd0fa960541237..61f4cc4e37c8ca9f9a8ef7f915f6271e5ed60cd7 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -184,7 +184,7 @@ class ElggInstaller {
 
                $title = elgg_echo("install:$step");
                $body = elgg_view("install/pages/$step", $vars);
-               page_draw(
+               echo elgg_view_page(
                                $title,
                                $body,
                                'page_shells/default',

diff --git a/mod/blog/start.php b/mod/blog/start.php
index c61e818ad670fdad5142c95a9e35ada66be7175b..1b2e31d03c1db8270dd69a544c7945ed82c6487d 100644 (file)
--- 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 ecfe61ae52fbf5b932d5810b48058d2556213164..8e30f52dd70fbd2c5702c8a3265ae8f4d7b9351e 100644 (file)
--- 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 e65f7d17941b71b13adaacb4fbf040208d70ce4a..92ee7e421d83803131d7d0da0d6b2451192cd81e 100644 (file)
--- 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 3a279a717701f32fdfbbe9855b085952e9638ad3..b2701b143cd190b600dc5c149d0de15b9ff1e463 100644 (file)
--- 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 e4620cb95b7356806953bd13d4d6e0d47b9ca2ab..ca0f9b9f4710137bc90071ec4f6b813e04964663 100644 (file)
--- 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 f4ca57365e90d70246764abcb72e5da5f602236b..2c6cc073bbd5a28036aca5c85b904b4f5cefb55f 100644 (file)
--- 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 8d091caa0849b8dc1353b4e6cb55ff41001902f6..5c2afc12070f5c64dc1d72a2e043ca88aed96061 100644 (file)
--- 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 984aedc606ff83ba2273321d24b5b7fd8c595034..038d7efa2656886f78220f26a51914e8c61c3b7d 100644 (file)
--- 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 28ec07031d0e9c9bc457a1aef80b3c36f470a4e9..7fb246367a9a23a2643b7513b47c297c97382a80 100644 (file)
--- 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 221e340791c20720a6aaea3bbd176609f86ae463..6568eae795f57ba20087c179760459b4039cfd32 100644 (file)
--- 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 a4cd4e01ebe788ab928b2641d36d3518b90572c7..975b8e66a0872ebc32aebf2011dac2b183cbde19 100644 (file)
--- 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 e35b3c067f4cc3ad749ef524275e6812dc9eb4c8..0fa2a2ead27cf1af2c3ddae36239fd2dfc215d3d 100644 (file)
--- 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 d0e24be977a5a5eb67333c7bd35abfcf13539013..4f436cca741798ea19f14497327ba42043faf5e4 100644 (file)
--- 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);\r
 \r
 // Finally draw the page\r
-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 8d62bf19fcf1e4bbad2c387954fef4f015deecd5..85bef8ae53543897a775985712807b09f5c30cd1 100644 (file)
--- 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 354437c7ee31b8b6ede2dba61d4f8c4e74c5dc03..666c6ad4b0ed679b9ca8a4757a4e5f370bf83e60 100644 (file)
--- 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 11880e4d6db37c9c88dbd0d765997d6b2e49f907..ddaec0060502efaeaa45fb1512af18dbc2fe9075 100644 (file)
--- 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 2c457f53b45fb17beff968f4b915a1e8ab02169d..03d220af06326fd93f154052a3080efa82528f17 100644 (file)
--- 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 d3e4a471ca78a76f53524d4b0ec21defdd1a6a91..603743009a4a62851e73f053ca0e30cbf7842d86 100644 (file)
--- 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 a64ca55db6a6e2731c215c890184e591cab1a36c..ffa96d71daa9160a589eea981de8d572575ff32e 100644 (file)
--- 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 48ff99805a368359dda72397b1fd6dac70b6eb98..de1363ae6c99dac53757f022e691eb82de61e7dd 100644 (file)
--- 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 296f4318bac544fccd6ee230fbf87e04b249992f..837534f9992d71ffb46c3c3d39ac366dacaa079e 100644 (file)
--- 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 f76c469ca1df65d33e636b812a33fc787c0391b4..48dfea58b55ad85c3c5fcc7481300564a81f5672 100644 (file)
--- 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 ace899772a8477e66fc7b0afd9aeb334b30a12ab..bfce96741e89438e23ca6197be9c38bacc24c0c4 100644 (file)
--- 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 8ade60b2ada7df339e1d4c6bffc894d343cd8fb1..e37825e74549a5ffcc33f5b382acf0f359b36eda 100644 (file)
--- 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 581a1d90de7818f6f6f29003473bcb5c7354d0c8..4f8179e58ed980c7e69fd8e28b0ac0fca8124ea1 100644 (file)
--- 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 d3ba05ead8f3bdabdf4c396bf55b6792e2604751..0673156f1e85c052f4205696eadc59e0e89719fa 100644 (file)
--- 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 b6e45f447546b1a317ff950be88143e5914bfb4b..25935565aa8a233292eb9a831d641bd5bce33ade 100644 (file)
--- 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 e85817dec7f2ce9988ca3cc06774460eec63ea98..589301ec61fa0ae798342a7dfa5e36b9d0441ea7 100644 (file)
--- 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 4b608bfc05244612e5bcc49a18c8f8af3a13c758..ca0584cccb5d4b215d409afd7ae2917d1973eccd 100644 (file)
--- 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 ff661ce9ca482f14e54d2882f35bcc0e67d7c354..816f9480f07c95509ed24156921a966b84da7fb5 100644 (file)
--- 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 0f793a9f69f7099fac828528d4fbaf941a303b0d..5f4a483be864d9f29e15c026e443eabd443fbb2c 100644 (file)
--- 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 da6ed00324d52ce691b09a996e4172892f637e19..2bbae1c7114d0bf2074b8e5ccd03eb9c22ce2142 100644 (file)
--- 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 c0a59b28982b1a09591b02b74b4789aee9438978..92563c91d02043562ee0bdd398b0eeb0f5e930e5 100644 (file)
--- 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 24aa721cf81e4bf3a1e38f1d8c2aa27a7ba9fac4..e2b22502dac5decd470625604b0b15105ec42eb0 100644 (file)
--- 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 c4329f128f4f6f76629d50f739969751a3aee0e7..baa8757a8d865e20b9887072f18cb737475edc52 100644 (file)
--- 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 904b6f9ff5a6be66e1bb014892d607ff7da35c79..0418e6b1d7eddb4e108cc4183ffc231fc955aab5 100644 (file)
--- 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 30207a7b99b99297d1da2ae7cc7a4ba5764de43e..d404e04339028c5e43f67ff25085776503fdd655 100644 (file)
--- 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 9228a65a9673f160e5308119639514d0ad86992e..6070a3fd0e25adac71396c35961fc61c3a53817d 100644 (file)
--- 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 7e48c06d8869ea902e543de9c8642c7c68a2f933..3cffbd292f892b883d4a4f72496da2aec213d0ef 100644 (file)
--- 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 2674daf16aeea8c392aeaac5e69b3125d6adfe2d..0d467d4497a3c0f127144b4a6bbe8770d56f6855 100644 (file)
--- 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 6eb58ed8ee7ac9b4b94bd725f4e4b9903d09b0d3..84b0ae55b8dacd97fdc7b13b337e9bebedbf41f2 100644 (file)
--- 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 41fa87aa1b8a6c5b9a784a08ffeb123fccc9b349..4386c5228dc86020948a70a99306362f484b9fda 100644 (file)
--- 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 f423bf8d5d8d095bd4a926146bd5f32c66c91058..ee9521ba40f44a67b41f44970ea1a15b70418685 100644 (file)
--- 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 97b656a5c5d7e23311b01f52af80509924f47e85..c6fc154acda2b3ab5627cea17c30b5d13ef3879b 100644 (file)
--- 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 9b0a654d209bf14b9718252ee7fb3bceebd75408..e3adef13f2398cb7e79ca3c5d2861244bd22fb87 100644 (file)
--- 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 22393df713328ee8393256e0f552ac919157de55..bf47d670c6b307de34ab44ac6b1f796706a84d48 100644 (file)
--- 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 3b97001fbdfdead4958910a68ca907f296aaa119..6cebf88c0fd723370e2b017058ef9d15ed3db41c 100644 (file)
--- 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 9a377b2d3cf72cfcbbf58f50f2461c24fbeb8a88..833ff38d1249a8e36ed74696a6f0163810b1c00e 100644 (file)
--- 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 e0aa21b1bc865c8a1065a8302e265db7a0f29985..153e6a75c96e814e9bdbf30a7e386dadab7e4ba0 100644 (file)
--- 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 705f6e0a8b32d6e1f0989b684922bf14fd0b5313..c68fb4a0fc46778a2e3914bacc702a4b4b24260f 100644 (file)
--- 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 ff21ec97f9510cad9e342aabf5302b63a8cc6ce5..5b575ef37ce6aafcff78fb574d02a70b49e45057 100644 (file)
--- 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));\r
                \r
 $content = elgg_view_layout('frontpage', $content, $sidebar);\r
-page_draw(null, $content);\r
+echo elgg_view_page(null, $content);\r

diff --git a/mod/sitepages/start.php b/mod/sitepages/start.php
index ea996e099bdfd341e0ffb4983393d444ce5b8d25..fb562b631b39ed90410811cdfb6e047b1930dcb6 100644 (file)
--- 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 f5cd3e7ae97757f156ce8707be094eb2760d4e07..a0bc1502f7ff8ce65a784580cbef242af3d8e267 100644 (file)
--- 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 f224d900a7a054afcf12ce5352fd0abb23223238..3b71cc1d6110fa111d5cd77755862ad237a4df23 100644 (file)
--- 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 e226e681bfc763d44d0d3a2d9b76330dcc23b396..74293d26f54d37dc6237c281d626daf92a8829e8 100644 (file)
--- 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 61eb9ef4aadac44a29ea4376632052238a70c3f9..41b8969aa6762dafad0e7bedc83a2d99c09e111a 100644 (file)
--- 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

diff --git a/pages/account/forgotten_password.php b/pages/account/forgotten_password.php
index 546dbfd6259cc20d56a0696a26197aa6e28d6319..3fb629ef604ee2bca4106f0d89923af04e8a7f9c 100644 (file)
--- 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 2500d11fc0a7cc2ad608d6961e60c3869cfaeac0..2638ef5610e15252c0ece7041f02f97586a6f3b2 100644 (file)
--- 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 6fbbec03503442e91f5265050f3146fcb692ba67..60a3bd17c936d8e569f239c8f950b290487a2c8b 100644 (file)
--- 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 3c81207f0d7452c6b1a3c80d2e864efd8e2e1c95..6dab598a1404e08d5de9f766711a686fb0279ac9 100644 (file)
--- 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 bbd110689d3716acd81335699f7c0f3d17e62c00..a79e0314deefe45f4e09bd16c6d98fb5a29c229e 100644 (file)
--- 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 0eb55286bff00ccc74ba5a22f6242d758f84a381..d43e6c25d3a40f68d5138f085ec5ffb21ca6076f 100644 (file)
--- 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 34944d62488d41fd40a1e33a2c7db89438111995..5eb6608a671bcede44ec300cf7597914178310f7 100644 (file)
--- 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 9cf0c58a6af1f0ddad87d8fdeaccca4aa09c31da..a37ba3a43b2d7c683b339b893c2931643ec37142 100644 (file)
--- 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 ddc7f965047f80320bc18fe43b9615f444f7dacf..a560094720d81ed868c3063e4f2d2cbd3b155ea2 100644 (file)
--- 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 e9ff87c16c000f9f2c02c0a90c6ae399ae503e0f..4e379cae4de587df9d6a9d822e1f72e5b8ae8035 100644 (file)
--- 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 0e09e09f0a17860f6c61d2d45cf7628685b04e2b..19806786e453986be0eadfc113e6e0977a191785 100644 (file)
--- 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 a768e69d7209dcecb83d6a1d081a9165932accbe..671d0ff2c76bcef0f2a02b185ac78222fe31db46 100644 (file)
--- 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 38b0094ee6950b250be79a2100a8b5a913796288..248dc8e5054afced0278dee995d9e7631fe8842e 100644 (file)
--- 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 62a3bb1baf9a06960d69bb122f01ad309b1d4199..6fd578ac968d0571f0655131f9889da963c34fdc 100644 (file)
--- 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);

diff --git a/services/api/rest_api.php b/services/api/rest_api.php
index d5f2d97341308d0629141feded1eaa5e00c2fd17..0f693117c97ed7e3568d41a2182952ba9e5cdbb5 100644 (file)
--- a/services/api/rest_api.php
+++ b/services/api/rest_api.php
@@ -55,4 +55,4 @@ if (!($result instanceof GenericResult)) {
 }
 
 // Output the result
-page_draw($method, elgg_view("api/output", array("result" => $result)));
\ No newline at end of file
+echo elgg_view_page($method, elgg_view("api/output", array("result" => $result)));
\ No newline at end of file

diff --git a/services/export/handler.php b/services/export/handler.php
index 33f4c2ac50f77925917b5105217929485c814eb3..21336bbec464f881078c2b1794e9f0c978997bbe 100644 (file)
--- a/services/export/handler.php
+++ b/services/export/handler.php
@@ -112,4 +112,4 @@ if (($guid != "") && ($type == "") && ($id_or_name == "")) {
        throw new InvalidParameterException(elgg_echo('InvalidParameterException:MissingParameter'));
 }
 
-page_draw($title, elgg_view_layout('one_column_with_sidebar', elgg_view_title($title) . $body));
\ No newline at end of file
+echo elgg_view_page($title, elgg_view_layout('one_column_with_sidebar', elgg_view_title($title) . $body));
\ No newline at end of file