Fixes #3792 admin can edit settings again

diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
index 1e2d6db101bd08d90b0d52c5c517082b91f3045a..c716703570443add48a20fbce5abdab334b3bc5b 100644 (file)
--- 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 29fa4db2fd3df124ef4c43c7efc81505acd7e7c7..3a86c1faa5b3a0bae6ed8cae7038b01c65618fe9 100644 (file)
--- 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 5964580ad150e81d561cbc3b4ab2b37155901be5..af97e112d1fcd40df54ec73c2175a40c4d22387c 100644 (file)
--- 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.",