From e9eca6aff6c7e2e2349b3b6cf714e2e7eb99405e Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Wed, 5 Mar 2014 20:22:03 -0500
Subject: Sharing optimization

Change the storage and display of sharings to improve the time needed to generate the page.
Instead of looking for a default value when displaying the sharing links, they are added
during the configuration.
---
 app/views/helpers/view/normal_view.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index ff535c60a..9fd06ebae 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -138,7 +138,7 @@ if (!empty($this->entries)) {
 							<?php foreach ($sharing as $share) :?>
 								<li class="item share">
 									<a target="_blank" href="<?php echo FreshRSS_Share::generateUrl($this->conf->shares, $share, $item->link(), $item->title() . ' . ' . $feed->name())?>">
-										<?php echo array_key_exists('name', $share) ? $share['name'] : Minz_Translate::t ($share['type']);?>
+										<?php echo Minz_Translate::t ($share['name']);?>
 									</a>
 								</li>
 							<?php endforeach;?>
-- 
cgit v1.2.3


From c2e9bfd0d7cddbadef272f2258b5fe1a5d1d26a6 Mon Sep 17 00:00:00 2001
From: Alexis Degrugillier <github@ainw.org>
Date: Fri, 7 Mar 2014 21:11:46 -0500
Subject: Add a test to avoid warnings in log

---
 app/views/configure/sharing.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index b50e6ddc4..ddb404ef5 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -35,7 +35,7 @@
 				<a href='#' class='share add'><?php echo FreshRSS_Themes::icon('add'); ?></a>
 				<select>
 					<?php foreach($this->conf->shares as $key => $params):?>
-						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php echo $params['help']?>'><?php echo Minz_Translate::t($key) ?></option>
+						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo Minz_Translate::t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
 			</div>
-- 
cgit v1.2.3