From 61e15988a0b37626e509543eec22e2452c3daad0 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 8 Dec 2016 16:23:49 +0100 Subject: [PATCH 1/2] Allow to overwrite the message which we already do in SubadminMiddleware Signed-off-by: Joas Schilling --- .../Middleware/Security/Exceptions/NotAdminException.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php b/lib/private/AppFramework/Middleware/Security/Exceptions/NotAdminException.php index 0c7da432af..94191f7f5b 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); } } From 10daad9346164b62e7a80b4666f33ecd5142c177 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Thu, 8 Dec 2016 16:24:21 +0100 Subject: [PATCH 2/2] Allow non-subadmins to change their language Signed-off-by: Joas Schilling --- settings/Controller/PersonalController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/settings/Controller/PersonalController.php b/settings/Controller/PersonalController.php index f9c6757546..696c0a5c41 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 */