summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib/Settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-03-27 19:27:49 +0200
committerGitHub <noreply@github.com>2018-03-27 19:27:49 +0200
commit06f52ead312aa5f556ad02f01abe48bcc049e28a (patch)
tree345533425a327ba18830ec12fcf96964a7132396 /apps/theming/lib/Settings
parent709589f2dbe3ce49f3bd71e1531e723353ee631d (diff)
parentb6501ae966582047a65b22b93f45c5bab049426d (diff)
downloadnextcloud-server-06f52ead312aa5f556ad02f01abe48bcc049e28a.tar.gz
nextcloud-server-06f52ead312aa5f556ad02f01abe48bcc049e28a.zip
Merge pull request #8993 from nextcloud/theming-allow-ui-with-theme
Show UI when using a custom theme
Diffstat (limited to 'apps/theming/lib/Settings')
-rw-r--r--apps/theming/lib/Settings/Admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php
index 708bf1914ea..d26a5680637 100644
--- a/apps/theming/lib/Settings/Admin.php
+++ b/apps/theming/lib/Settings/Admin.php
@@ -67,7 +67,7 @@ class Admin implements ISettings {
$theme = $this->config->getSystemValue('theme', '');
if ($theme !== '') {
$themable = false;
- $errorMessage = $this->l->t('You are already using a custom theme');
+ $errorMessage = $this->l->t('You are already using a custom theme. Theming app settings might be overwritten by that.');
}
$parameters = [