summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-07-13 13:41:31 +0200
committerGitHub <noreply@github.com>2017-07-13 13:41:31 +0200
commite335121d5ead8b8a223ca12212529c2230bc1c5d (patch)
tree67c7d37db38d9147c4352ff55c66bffe7dfbe0cc /apps/theming/lib
parentf71457782b1c0e6aa66ba6b2aac126aa5a2bc9dc (diff)
parentce5ad7e7f48751b25ef9dd377fbbface2adb30b4 (diff)
downloadnextcloud-server-e335121d5ead8b8a223ca12212529c2230bc1c5d.tar.gz
nextcloud-server-e335121d5ead8b8a223ca12212529c2230bc1c5d.zip
Merge pull request #5070 from nextcloud/theming-vs-themes
Prefer custom theme over the theming app
Diffstat (limited to 'apps/theming/lib')
-rw-r--r--apps/theming/lib/Util.php13
1 files changed, 13 insertions, 0 deletions
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 286756a4849..1df16ea4976 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -199,4 +199,17 @@ class Util {
return $svg;
}
+ /**
+ * Check if a custom theme is set in the server configuration
+ *
+ * @return bool
+ */
+ public function isAlreadyThemed() {
+ $theme = $this->config->getSystemValue('theme', '');
+ if ($theme !== '') {
+ return true;
+ }
+ return false;
+ }
+
}