[Pkg-owncloud-commits] [owncloud] 25/34: Support HTML in logo claim

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 8d87a2c4a643dffa42b2a52d0c662992946271ce
Author: Lukas Reschke <lukas at owncloud.com>
Date:   Mon Nov 3 21:13:07 2014 +0100

    Support HTML in logo claim
---
 core/templates/layout.user.php |  2 +-
 lib/private/defaults.php       | 12 ++++++++++++
 lib/public/defaults.php        |  8 ++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 91affc9..4b1d30c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -53,7 +53,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 dfd114c..7993d17 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -143,6 +143,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 9af3124..662071a 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
 	 */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git