aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-16 01:18:13 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-16 01:18:13 +0000
commita9acf7d6f8f9af7e5d031e004e2ed207ac3e3aba (patch)
treec06d714189e217c2719ab8095555b24c5949dbf5 /engine/lib
parent2e1e7b19be7bcb78652b8da599183896246ecaf5 (diff)
downloadelgg-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')
-rw-r--r--engine/lib/admin.php2
-rw-r--r--engine/lib/elgglib.php2
-rw-r--r--engine/lib/views.php8
3 files changed, 6 insertions, 6 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);
}
/**