diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
| commit | ca08eb6d170d375ef4fca53604956f3474c7db19 (patch) | |
| tree | a1e96c6b0ae322fab93373a66e1951e2b3b9be48 /settings | |
| parent | be37104ac63cd25f2eac831ca03d6d2b19976e1c (diff) | |
| download | elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.gz elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.bz2 | |
Merged r6701:6756 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/index.php | 4 | ||||
| -rw-r--r-- | settings/plugins.php | 13 | ||||
| -rw-r--r-- | settings/statistics.php | 12 | ||||
| -rw-r--r-- | settings/user.php | 15 |
4 files changed, 26 insertions, 18 deletions
diff --git a/settings/index.php b/settings/index.php index b5a966dbb..a786a4e51 100644 --- a/settings/index.php +++ b/settings/index.php @@ -12,12 +12,12 @@ require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); if (!page_owner()) { - set_page_owner($_SESSION['guid']); + set_page_owner(get_loggedin_userid()); } // Make sure we don't open a security hole ... if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { - set_page_owner($_SESSION['guid']); + set_page_owner(get_loggedin_userid()); } // Forward to the user settings diff --git a/settings/plugins.php b/settings/plugins.php index 11459a6b7..719634d52 100644 --- a/settings/plugins.php +++ b/settings/plugins.php @@ -1,6 +1,6 @@ <?php /** - * Elgg user settings functions. + * Elgg user plugin settings. * * @package Elgg * @subpackage Core @@ -8,7 +8,6 @@ * @link http://elgg.org/ */ -// Get the Elgg framework require_once(dirname(dirname(__FILE__)) . "/engine/start.php"); // Make sure only valid users can see this @@ -16,8 +15,12 @@ gatekeeper(); // Make sure we don't open a security hole ... if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { - set_page_owner($_SESSION['guid']); + set_page_owner(get_loggedin_userid()); } -// Display main admin menu -page_draw(elgg_echo("usersettings:plugins"),elgg_view_layout('one_column_with_sidebar', elgg_view_title(elgg_echo("usersettings:plugins")) . elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins())))); +$content = elgg_view_title(elgg_echo("usersettings:plugins")); +$content .= elgg_view("usersettings/plugins", array('installed_plugins' => get_installed_plugins())); + +$body = elgg_view_layout('one_column_with_sidebar', $content); + +page_draw(elgg_echo("usersettings:plugins"), $body); diff --git a/settings/statistics.php b/settings/statistics.php index f354168b4..e0d2edbf5 100644 --- a/settings/statistics.php +++ b/settings/statistics.php @@ -1,6 +1,6 @@ <?php /** - * Elgg user settings functions. + * Elgg user statistics. * * @package Elgg * @subpackage Core @@ -16,8 +16,12 @@ gatekeeper(); // Make sure we don't open a security hole ... if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { - set_page_owner($_SESSION['guid']); + set_page_owner(get_loggedin_userid()); } -// Display main admin menu -page_draw(elgg_echo("usersettings:statistics"),elgg_view_layout('one_column_with_sidebar', elgg_view_title(elgg_echo("usersettings:statistics")) . elgg_view("usersettings/statistics")));
\ No newline at end of file +$content = elgg_view_title(elgg_echo("usersettings:statistics")); +$content .= elgg_view("usersettings/statistics"); + +$body = elgg_view_layout('one_column_with_sidebar', $content); + +page_draw(elgg_echo("usersettings:statistics"), $body); diff --git a/settings/user.php b/settings/user.php index 7e7a3967f..0d5b0e219 100644 --- a/settings/user.php +++ b/settings/user.php @@ -1,6 +1,6 @@ <?php /** - * Elgg user settings functions. + * Elgg user account settings. * * @package Elgg * @subpackage Core @@ -16,11 +16,12 @@ gatekeeper(); // Make sure we don't open a security hole ... if ((!page_owner_entity()) || (!page_owner_entity()->canEdit())) { - set_page_owner($_SESSION['guid']); + set_page_owner(get_loggedin_userid()); } -// Display main admin menu -page_draw( - elgg_echo("usersettings:user"), - elgg_view_layout("one_column_with_sidebar", elgg_view_title(elgg_echo('usersettings:user')) . elgg_view("usersettings/form")) -);
\ No newline at end of file +$content = elgg_view_title(elgg_echo('usersettings:user')); +$content .= elgg_view("usersettings/form"); + +$body = elgg_view_layout("one_column_with_sidebar", $content); + +page_draw(elgg_echo("usersettings:user"), $body); |