aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash.costello@gmail.com>2011-11-18 22:40:04 -0500
committercash <cash.costello@gmail.com>2011-11-28 21:44:01 -0500
commit268b33d5338ec2e4da9a0a3c81a8917ce1bfda60 (patch)
treee95a47ba0e6ee9c86872c07b0301e4cb7b6833b8
parentd1eb0c95aff69a20aecf837c0cedcbfe481706cd (diff)
downloadelgg-268b33d5338ec2e4da9a0a3c81a8917ce1bfda60.tar.gz
elgg-268b33d5338ec2e4da9a0a3c81a8917ce1bfda60.tar.bz2
Fixes #3792 admin can edit settings again
-rw-r--r--engine/lib/user_settings.php4
-rw-r--r--engine/lib/users.php5
-rw-r--r--languages/en.php1
3 files changed, 8 insertions, 2 deletions
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index 1e2d6db10..c71670357 100644
--- a/engine/lib/user_settings.php
+++ b/engine/lib/user_settings.php
@@ -265,8 +265,8 @@ function elgg_set_user_default_access() {
* @access private
*/
function usersettings_pagesetup() {
- if (elgg_get_context() == "settings" && elgg_get_logged_in_user_guid()) {
- $user = elgg_get_logged_in_user_entity();
+ if (elgg_get_context() == "settings") {
+ $user = elgg_get_page_owner_entity();
$params = array(
'name' => '1_account',
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 29fa4db2f..3a86c1faa 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -1283,6 +1283,11 @@ function elgg_user_hover_menu($hook, $type, $return, $params) {
$item = new ElggMenuItem('profile:edit', elgg_echo('profile:edit'), $url);
$item->setSection('admin');
$return[] = $item;
+
+ $url = "settings/user/$user->username";
+ $item = new ElggMenuItem('settings:edit', elgg_echo('settings:edit'), $url);
+ $item->setSection('admin');
+ $return[] = $item;
}
return $return;
diff --git a/languages/en.php b/languages/en.php
index 5964580ad..af97e112d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -481,6 +481,7 @@ $english = array(
'account' => "Account",
'settings' => "Settings",
'tools' => "Tools",
+ 'settings:edit' => 'Edit settings',
'register' => "Register",
'registerok' => "You have successfully registered for %s.",