From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 21 Feb 2011 20:29:17 +0000 (+0000)
Subject: Refs #2950: Move page/shells/ directly under /page/ since nowhere else in views do... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2aae26964b28be8281a75cf97034c90b8c8d736e;p=lorea%2Felgg.git

Refs #2950: Move page/shells/ directly under /page/ since nowhere else in views do we use a shells directory.

git-svn-id: http://code.elgg.org/elgg/trunk@8387 36083f99-b078-4883-b0ff-0f9b5a30f544
---

diff --git a/engine/lib/views.php b/engine/lib/views.php
index f019fee5f..bed9ee874 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -602,7 +602,7 @@ function elgg_view_page($title, $body, $page_shell = 'default', $vars = array())
 	$vars['sysmessages'] = $messages;
 
 	// Draw the page
-	$output = elgg_view("page/shells/$page_shell", $vars);
+	$output = elgg_view("page/$page_shell", $vars);
 
 	$vars['page_shell'] = $page_shell;
 
diff --git a/views/default/page/shells/admin.php b/views/default/page/admin.php
similarity index 100%
rename from views/default/page/shells/admin.php
rename to views/default/page/admin.php
diff --git a/views/default/page/shells/default.php b/views/default/page/default.php
similarity index 100%
rename from views/default/page/shells/default.php
rename to views/default/page/default.php
diff --git a/views/default/page/shells/upgrade.php b/views/default/page/upgrade.php
similarity index 100%
rename from views/default/page/shells/upgrade.php
rename to views/default/page/upgrade.php
diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/walled_garden.php
similarity index 100%
rename from views/default/page/shells/walled_garden.php
rename to views/default/page/walled_garden.php