From 9428613b2da6132ef507e92461535283d48ecdc1 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 4 Feb 2009 02:33:50 +0000
Subject: merge 3120 from trunk optimizations (php only) - removed unnecessary
 call to array_unique in get_image_ids_for_tags - put back in smarty exec time
 counting (debug mode) for each included template - prefix some smarty
 modifiers with @ in some templates - do not call format_date (still very slow
 due to mktime and date even after prev commit) from category_default.inc.php
 - if used in templates format_date can be used as a smarty modifier

git-svn-id: http://piwigo.org/svn/branches/2.0@3121 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 template/yoga/header.tpl              |  4 ++--
 template/yoga/mainpage_categories.tpl | 20 ++++++++++----------
 template/yoga/picture_content.tpl     |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'template')

diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index 668d7c505..abe063799 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -6,13 +6,13 @@
 <meta name="generator" content="Piwigo (aka PWG), see piwigo.org">
 {if isset($meta_ref) } 
 {if isset($INFO_AUTHOR)}
-<meta name="author" content="{$INFO_AUTHOR|replace:'"':' '}">
+<meta name="author" content="{$INFO_AUTHOR|@replace:'"':' '}">
 {/if}
 {if isset($related_tags)}
 <meta name="keywords" content="{foreach from=$related_tags item=tag name=tag_loop}{if !$smarty.foreach.tag_loop.first}, {/if}{$tag.name}{/foreach}">
 {/if}
 {if isset($COMMENT_IMG)}
-<meta name="description" content="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
+<meta name="description" content="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
 {else}
 <meta name="description" content="{$PAGE_TITLE}{if isset($INFO_FILE)} - {$INFO_FILE}{/if}">
 {/if}
diff --git a/template/yoga/mainpage_categories.tpl b/template/yoga/mainpage_categories.tpl
index e56b637aa..e1cc953ff 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/yoga/mainpage_categories.tpl
@@ -6,7 +6,7 @@
 		<div class="thumbnailCategory">
 			<div class="illustration">
 			<a href="{$cat.URL}">
-				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|replace:'"':' '} - {'hint_category'|@translate}">
+				<img src="{$cat.TN_SRC}" alt="{$cat.TN_ALT}" title="{$cat.NAME|@replace:'"':' '} - {'hint_category'|@translate}">
 			</a>
 			</div>
 			<div class="description">
@@ -14,15 +14,15 @@
 					<a href="{$cat.URL}">{$cat.NAME}</a>
 					{$cat.ICON_TS}
 				</h3>
-        <div class="text">
-  				{if isset($cat.INFO_DATES) }
-  				<p class="dates">{$cat.INFO_DATES}</p>
-  				{/if}
-  				<p class="Nb_images">{$cat.CAPTION_NB_IMAGES}</p>
-  				{if not empty($cat.DESCRIPTION)}
-  				<p>{$cat.DESCRIPTION}</p>
-  				{/if}
-        </div>
+		<div class="text">
+				{if isset($cat.INFO_DATES) }
+				<p class="dates">{$cat.INFO_DATES}</p>
+				{/if}
+				<p class="Nb_images">{$cat.CAPTION_NB_IMAGES}</p>
+				{if not empty($cat.DESCRIPTION)}
+				<p>{$cat.DESCRIPTION}</p>
+				{/if}
+		</div>
 			</div>
 		</div>
 	</li>
diff --git a/template/yoga/picture_content.tpl b/template/yoga/picture_content.tpl
index b6e148fdd..dcf0f6d24 100644
--- a/template/yoga/picture_content.tpl
+++ b/template/yoga/picture_content.tpl
@@ -4,7 +4,7 @@
 {/if}
   <img src="{$SRC_IMG}" style="width:{$WIDTH_IMG}px;height:{$HEIGHT_IMG}px;" alt="{$ALT_IMG}" 
 	{if isset($COMMENT_IMG)}
-		title="{$COMMENT_IMG|strip_tags:false|replace:'"':' '}" {else} title="{$current.TITLE|replace:'"':' '} - {$ALT_IMG}"
+		title="{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}" {else} title="{$current.TITLE|@replace:'"':' '} - {$ALT_IMG}"
 	{/if}>
 {if isset($high) }
 </a>
-- 
cgit v1.2.3