diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-09-30 23:04:47 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-09-30 23:04:47 +0000 |
| commit | 5d090b23cca3b0f831b29fe4dad2926f1b3b33fc (patch) | |
| tree | 562058ca452170e1556b26627cbae6ef63ae11f0 | |
| parent | dc5813300352f43b0ed67e0811967e1ec12628c3 (diff) | |
| download | elgg-5d090b23cca3b0f831b29fe4dad2926f1b3b33fc.tar.gz elgg-5d090b23cca3b0f831b29fe4dad2926f1b3b33fc.tar.bz2 | |
Refs #2344 - moves settings pages into the pages directory
git-svn-id: http://code.elgg.org/elgg/trunk@6986 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/usersettings.php | 16 | ||||
| -rw-r--r-- | pages/settings/index.php (renamed from settings/index.php) | 3 | ||||
| -rw-r--r-- | pages/settings/plugins.php (renamed from settings/plugins.php) | 2 | ||||
| -rw-r--r-- | pages/settings/statistics.php (renamed from settings/statistics.php) | 3 | ||||
| -rw-r--r-- | pages/settings/user.php (renamed from settings/user.php) | 3 |
5 files changed, 11 insertions, 16 deletions
diff --git a/engine/lib/usersettings.php b/engine/lib/usersettings.php index baaf41562..e4416ab5e 100644 --- a/engine/lib/usersettings.php +++ b/engine/lib/usersettings.php @@ -46,13 +46,19 @@ function usersettings_pagesetup() { function usersettings_page_handler($page) { global $CONFIG; - $path = $CONFIG->path . "settings/index.php"; + $path = $CONFIG->path . "pages/settings/index.php"; if ($page[0]) { switch ($page[0]) { - case 'user' : $path = $CONFIG->path . "settings/user.php"; break; - case 'statistics' : $path = $CONFIG->path . "settings/statistics.php"; break; - case 'plugins' : $path = $CONFIG->path . "settings/plugins.php"; break; + case 'user': + $path = $CONFIG->path . "pages/settings/user.php"; + break; + case 'statistics': + $path = $CONFIG->path . "pages/settings/statistics.php"; + break; + case 'plugins': + $path = $CONFIG->path . "pages/settings/plugins.php"; + break; } } @@ -60,7 +66,7 @@ function usersettings_page_handler($page) { set_input('username', $page[1]); } - include($path); + require($path); } /** diff --git a/settings/index.php b/pages/settings/index.php index a786a4e51..53b5a3490 100644 --- a/settings/index.php +++ b/pages/settings/index.php @@ -8,9 +8,6 @@ * @link http://elgg.org/ */ -// Get the Elgg framework -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); - if (!page_owner()) { set_page_owner(get_loggedin_userid()); } diff --git a/settings/plugins.php b/pages/settings/plugins.php index 719634d52..0ce633c6f 100644 --- a/settings/plugins.php +++ b/pages/settings/plugins.php @@ -8,8 +8,6 @@ * @link http://elgg.org/ */ -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); - // Make sure only valid users can see this gatekeeper(); diff --git a/settings/statistics.php b/pages/settings/statistics.php index e0d2edbf5..9f6fceed0 100644 --- a/settings/statistics.php +++ b/pages/settings/statistics.php @@ -8,9 +8,6 @@ * @link http://elgg.org/ */ -// Get the Elgg framework -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); - // Make sure only valid admin users can see this gatekeeper(); diff --git a/settings/user.php b/pages/settings/user.php index 0d5b0e219..3bcd3e09e 100644 --- a/settings/user.php +++ b/pages/settings/user.php @@ -8,9 +8,6 @@ * @link http://elgg.org/ */ -// Get the Elgg framework -require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); - // Make sure only valid admin users can see this gatekeeper(); |