summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2014-11-05 13:54:29 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2014-11-05 13:54:29 +0100
commit06267fec8fb57ba6921d4c704cb2c05eb1d4c36e (patch)
treefe61836863d5a37225abcb7c82b903505f3f01f3
parent7f41048a338c1dfb170bae211a6f591016c8d0d5 (diff)
parentbe5ae6c44f8fae9364c0be65f4f685d7c1afa104 (diff)
downloadnextcloud-server-06267fec8fb57ba6921d4c704cb2c05eb1d4c36e.tar.gz
nextcloud-server-06267fec8fb57ba6921d4c704cb2c05eb1d4c36e.zip
Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--lib/private/defaults.php12
-rw-r--r--lib/public/defaults.php8
3 files changed, 21 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9f94344b21b..f7f2b3dc735 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,7 +49,7 @@
if(OC_Util::getEditionString() === '') {
p(!empty($_['application'])?$_['application']: $l->t('Apps'));
} else {
- p($theme->getName());
+ print_unescaped($theme->getHTMLName());
}
?>
</div>
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index cc6c819f03f..c16ebdbe24c 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -157,6 +157,18 @@ class OC_Defaults {
}
/**
+ * Returns the short name of the software containing HTML strings
+ * @return string title
+ */
+ public function getHTMLName() {
+ if ($this->themeExist('getHTMLName')) {
+ return $this->theme->getHTMLName();
+ } else {
+ return $this->defaultName;
+ }
+ }
+
+ /**
* Returns entity (e.g. company name) - used for footer, copyright
* @return string entity name
*/
diff --git a/lib/public/defaults.php b/lib/public/defaults.php
index 9af31245ff4..662071a29a9 100644
--- a/lib/public/defaults.php
+++ b/lib/public/defaults.php
@@ -98,6 +98,14 @@ class Defaults {
}
/**
+ * name of your ownCloud instance containing HTML styles
+ * @return string
+ */
+ public function getHTMLName() {
+ return $this->defaults->getHTMLName();
+ }
+
+ /**
* Entity behind your onwCloud instance
* @return string
*/