summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-10-23 10:18:45 +0200
committerGitHub <noreply@github.com>2018-10-23 10:18:45 +0200
commit31d1179c412a47d7ff1c433ec60effeb8e01b7ed (patch)
tree4c579621ee0fd0b62a583b7383cafa844ddef2c6 /apps
parentc19c1164bcc3a90f1f2baba3de1b4b82d2c04c0b (diff)
parent3ac15a45ea7582b8ede19a7fb0517c25408901e0 (diff)
downloadnextcloud-server-31d1179c412a47d7ff1c433ec60effeb8e01b7ed.tar.gz
nextcloud-server-31d1179c412a47d7ff1c433ec60effeb8e01b7ed.zip
Merge pull request #11973 from nextcloud/bug/accessibility/get_js_without_uid
If there is no UID do not explode accessibility javascript
Diffstat (limited to 'apps')
-rw-r--r--apps/accessibility/lib/Controller/AccessibilityController.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
index cdc9e004404..a8fba556acb 100644
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -192,9 +192,17 @@ class AccessibilityController extends Controller {
* @return DataDownloadResponse
*/
public function getJavascript(): DataDownloadResponse {
+ $user = $this->userSession->getUser();
+
+ if ($user === null) {
+ $theme = false;
+ } else {
+ $theme = $this->config->getUserValue($user->getUID(), $this->appName, 'theme', false);
+ }
+
$responseJS = '(function() {
OCA.Accessibility = {
- theme: ' . json_encode($this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'theme', false)) . ',
+ theme: ' . json_encode($theme) . ',
};
})();';