diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-16 01:18:13 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-11-16 01:18:13 +0000 |
commit | a9acf7d6f8f9af7e5d031e004e2ed207ac3e3aba (patch) | |
tree | c06d714189e217c2719ab8095555b24c5949dbf5 /engine/lib/views.php | |
parent | 2e1e7b19be7bcb78652b8da599183896246ecaf5 (diff) | |
download | elgg-a9acf7d6f8f9af7e5d031e004e2ed207ac3e3aba.tar.gz elgg-a9acf7d6f8f9af7e5d031e004e2ed207ac3e3aba.tar.bz2 |
Fixes #2642 changed elgg_view_page() to always pick up page_shell views for the page_shells directory
git-svn-id: http://code.elgg.org/elgg/trunk@7325 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/views.php')
-rw-r--r-- | engine/lib/views.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/lib/views.php b/engine/lib/views.php index 40847d1cd..c296fa1ac 100644 --- a/engine/lib/views.php +++ b/engine/lib/views.php @@ -1266,14 +1266,14 @@ function autoregister_views($view_base, $folder, $base_location_path, $viewtype) * * @param string $title Title * @param string $body Body - * @param string $page_shell Optional page shell to use. + * @param string $page_shell Optional page shell to use. See page_shells view directory * @param array $vars Optional vars array to pass to the page * shell. Automatically adds title, body, and sysmessages * * @return string The contents of the page * @since 1.8 */ -function elgg_view_page($title, $body, $page_shell = 'page_shells/default', $vars = array()) { +function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) { // get messages - try for errors first $sysmessages = system_messages(NULL, "errors"); @@ -1290,7 +1290,7 @@ function elgg_view_page($title, $body, $page_shell = 'page_shells/default', $var $vars['sysmessages'] = $sysmessages; // Draw the page - $output = elgg_view($page_shell, $vars); + $output = elgg_view("page_shells/$page_shell", $vars); $vars['page_shell'] = $page_shell; @@ -1307,7 +1307,7 @@ function page_draw($title, $body, $sidebar = "") { $vars = array( 'sidebar' => $sidebar ); - echo elgg_view_page($title, $body, 'page_shells/default', $vars); + echo elgg_view_page($title, $body, 'default', $vars); } /** |