diff options
| -rw-r--r-- | engine/lib/admin.php | 2 | ||||
| -rw-r--r-- | engine/lib/elgglib.php | 2 | ||||
| -rw-r--r-- | engine/lib/views.php | 8 | ||||
| -rw-r--r-- | install/ElggInstaller.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engine/lib/admin.php b/engine/lib/admin.php index 2e2003bc8..1e6f896ae 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', array('content' => $content)); - echo elgg_view_page($title, $body, 'page_shells/admin'); + echo elgg_view_page($title, $body, 'admin'); } /** diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index d369f0fdc..cf3d25822 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -2142,7 +2142,7 @@ function js_page_handler($page) { function elgg_walled_garden_index() { $login = elgg_view('account/login_walled_garden'); - echo elgg_view_page('', $login, 'page_shells/walled_garden'); + echo elgg_view_page('', $login, 'walled_garden'); // @hack Index must exit to keep plugins from continuing to extend exit; 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); } /** diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php index e52e3b056..060480791 100644 --- a/install/ElggInstaller.php +++ b/install/ElggInstaller.php @@ -187,7 +187,7 @@ class ElggInstaller { echo elgg_view_page( $title, $body, - 'page_shells/default', + 'default', array( 'step' => $step, 'steps' => $this->getSteps(), |