[Pkg-owncloud-commits] [owncloud] 12/205: fix path to owncloud logo

[David Prévot]

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit fa16c1f9b4c2ad3f3d0406747c52c06b861580ba
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date:   Wed Jun 17 13:52:18 2015 +0200

    fix path to owncloud logo
---
 apps/files_sharing/settings-personal.php           | 2 ++
 apps/files_sharing/templates/settings-personal.php | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/settings-personal.php b/apps/files_sharing/settings-personal.php
index f4d61b3..9a9629c 100644
--- a/apps/files_sharing/settings-personal.php
+++ b/apps/files_sharing/settings-personal.php
@@ -28,11 +28,13 @@ $uid = \OC::$server->getUserSession()->getUser()->getUID();
 $server = \OC::$server->getURLGenerator()->getAbsoluteURL('/');
 $cloudID = $uid . '@' . rtrim(\OCA\Files_Sharing\Helper::removeProtocolFromUrl($server), '/');
 $url = 'https://owncloud.org/federation';
+$ownCloudLogoPath = \OC::$server->getURLGenerator()->imagePath('files_sharing', 'social-owncloud.svg');
 
 $tmpl = new OCP\Template('files_sharing', 'settings-personal');
 $tmpl->assign('outgoingServer2serverShareEnabled', \OCA\Files_Sharing\Helper::isOutgoingServer2serverShareEnabled());
 $tmpl->assign('message_with_URL', $l->t('Share with me through my #ownCloud federation ID %s see %s', [$cloudID, $url]));
 $tmpl->assign('message_without_URL', $l->t('Share with me through my #ownCloud federation ID %s', [$cloudID]));
+$tmpl->assign('owncloud_logo_path', $ownCloudLogoPath);
 $tmpl->assign('reference', $url);
 $tmpl->assign('cloudId', $cloudID);
 
diff --git a/apps/files_sharing/templates/settings-personal.php b/apps/files_sharing/templates/settings-personal.php
index c6bb147..528e74f 100644
--- a/apps/files_sharing/templates/settings-personal.php
+++ b/apps/files_sharing/templates/settings-personal.php
@@ -51,7 +51,7 @@ style('files_sharing', '3rdparty/gs-share/style');
 			<?php p($l->t('Add it to your website:')); ?>
 
 			<a target="_blank" href="<?php p($_['reference']); ?>">
-				<img src="img/social-owncloud.svg" />
+				<img src="<?php p($_['owncloud_logo_path']); ?>" />
 				<?php p($l->t('Share with me via ownCloud')); ?>
 			</a>
 		</p>
@@ -59,7 +59,7 @@ style('files_sharing', '3rdparty/gs-share/style');
 		<p>
 			<?php p($l->t('HTML Code:')); ?>
 			<xmp><a target="_blank" href="<?php p($_['reference']); ?>">
-	<img src="../img/social-owncloud.svg" />
+	<img src="<?php  p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>" />
 	<?php p($l->t('Share with me via ownCloud')); ?>
 
 </a></xmp>

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