diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-12-08 17:52:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-08 17:52:44 +0100 |
| commit | 60e4299bcbf441a45605ae3a8f7cb74afd00301d (patch) | |
| tree | 35bcef97d4c1cf5917067ef22285621d686a6ff7 | |
| parent | 402a07bfe078aaa47b22f4db8c31b5e9c594f037 (diff) | |
| parent | 10daad9346164b62e7a80b4666f33ecd5142c177 (diff) | |
| download | nextcloud-server-60e4299bcbf441a45605ae3a8f7cb74afd00301d.tar.gz nextcloud-server-60e4299bcbf441a45605ae3a8f7cb74afd00301d.zip | |
Merge pull request #2571 from nextcloud/issue-2568-allow-non-subadmins-to-change-language
Allow non subadmins to change language
| -rw-r--r-- | lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php | 4 | ||||
| -rw-r--r-- | settings/Controller/PersonalController.php | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php index 0c7da432afe..94191f7f5b5 100644 --- a/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php +++ b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php @@ -34,7 +34,7 @@ use OCP\AppFramework\Http; * @package OC\AppFramework\Middleware\Security\Exceptions */ class NotAdminException extends SecurityException { - public function __construct() { - parent::__construct('Logged in user must be an admin', Http::STATUS_FORBIDDEN); + public function __construct($message = 'Logged in user must be an admin') { + parent::__construct($message, Http::STATUS_FORBIDDEN); } } diff --git a/settings/Controller/PersonalController.php b/settings/Controller/PersonalController.php index f9c67575466..696c0a5c414 100644 --- a/settings/Controller/PersonalController.php +++ b/settings/Controller/PersonalController.php @@ -69,6 +69,7 @@ class PersonalController extends Controller { /** * @NoAdminRequired + * @NoSubadminRequired * @param string $lang * @return JSONResponse */ |