Figured what has been causing a problem with using && and || in smarty templates and related to mistake in processing {2} elements that should use curly brackets and not revert to square ones.

4 files changed, 12 insertions, 12 deletions

diff --git a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
index 8b3a4e8..1452f99 100755
--- a/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
+++ b/gallery_views/fixed_grid/fisheye_fixed_grid_inc.tpl
@@ -9,7 +9,7 @@
 	{pagination gallery_id=$gContent->mGalleryId}
 
 	<div class="body">
-		{if !empty($fisheyeSuccess) or !empty($fisheyeErrors) or !empty($fisheyeWarnings) }
+		{if !empty($fisheyeSuccess) || !empty($fisheyeErrors) || !empty($fisheyeWarnings) }
 			{formfeedback success=$fisheyeSuccess error=$fisheyeErrors warning=$fisheyeWarnings}
 		{/if}
 
@@ -21,7 +21,7 @@
 		<table class="thumbnailblock">
 		{counter assign="imageCount" start="0" print=false}
 		{assign var="max" value=100}
-		{if !empty($cols_per_page) and $cols_per_page > 0}{assign var="tdWidth" value="`$max/$cols_per_page`"}{else}{assign var="tdWidth" value="25"}{assign var="cols_per_page" value="1"}{/if}
+		{if !empty($cols_per_page) && $cols_per_page > 0}{assign var="tdWidth" value="`$max/$cols_per_page`"}{else}{assign var="tdWidth" value="25"}{assign var="cols_per_page" value="1"}{/if}
 		{foreach from=$gContent->mItems item=galItem key=itemContentId}
 			{if $imageCount % $cols_per_page == 0}
 				<tr > <!-- Begin Image Row -->
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
index 1ee82b1..50a97a1 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_1.tpl
@@ -38,10 +38,10 @@
 								{$galItem->mInfo.event_time|bit_short_date}
 							</div>
 							{/if}
-							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width and $galItem->mInfo.height}
+								{if $galItem->mInfo.width && $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
diff --git a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
index f644b83..7dd20d0 100755
--- a/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
+++ b/gallery_views/galleriffic/fisheye_galleriffic_inc_5.tpl
@@ -39,10 +39,10 @@
 								{$galItem->mInfo.event_time|bit_short_date}
 							</div>
 							{/if}
-							{if ($galItem->hasUpdatePermission() or $gContent->getPreference('link_original_images')) and $galItem->getDownloadUrl()}
+							{if ($galItem->hasUpdatePermission() || $gContent->getPreference('link_original_images')) && $galItem->getDownloadUrl()}
 							<div class="download">
 								<a href="{$galItem->getDownloadUrl()}">{tr}Download Original{/tr}</a>
-								{if $galItem->mInfo.width and $galItem->mInfo.height}
+								{if $galItem->mInfo.width && $galItem->mInfo.height}
 								<div class="photo-date">{$galItem->mInfo.width}x{$galItem->mInfo.height} {tr}pixels{/tr}</div>
 								{/if}
 							</div>
diff --git a/gallery_views/simple_list/fisheye_simple_list_inc.tpl b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
index f0a3ac2..c0e6417 100755
--- a/gallery_views/simple_list/fisheye_simple_list_inc.tpl
+++ b/gallery_views/simple_list/fisheye_simple_list_inc.tpl
@@ -25,7 +25,7 @@
 			<th style="width:60%">
 				{smartlink ititle=Name isort=title icontrol=$galInfo}
 			</th>
-			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+			{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 				<th style="width:10%">
 					{smartlink ititle=Uploaded isort=created iorder=desc idefault=1 icontrol=$galInfo}
 				</th>
@@ -46,7 +46,7 @@
 					<td style="text-align:center;">
 						{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
 							{if $gBitSystem->isFeatureActive( 'site_fancy_zoom' )}
-								{if $gContent->hasUpdatePermission() or $gGallery and $gGallery->getPreference( 'link_original_images' )}
+								{if $gContent->hasUpdatePermission() || $gGallery && $gGallery->getPreference( 'link_original_images' )}
 									<a href="{$galItem->getDownloadUrl()|escape}">
 								{else}
 									<a href="{$galItem->mInfo.thumbnail_url.large}">
@@ -65,7 +65,7 @@
 				{/if}
 				<td>
 					<h3><a href="{$galItem->getDisplayUrl()}">{$galItem->getTitle()|escape}</a></h3>
-					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) and $galItem->mInfo.data}
+					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_desc' ) && $galItem->mInfo.data}
 						{$galItem->mInfo.parsed_data}
 					{/if}
 					{if $gBitSystem->isFeatureActive( 'fisheye_item_list_attid' )}
@@ -83,7 +83,7 @@
 						{/if}
 					{/if}
 				</td>
-				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) or $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
+				{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' ) || $gBitSystem->isFeatureActive( 'fisheye_item_list_creator' )}
 					<td>
 						{if $gBitSystem->isFeatureActive( 'fisheye_item_list_date' )}
 							{$galItem->mInfo.created|bit_short_date}<br />
@@ -110,13 +110,13 @@
 				{/if}
 				<td class="actionicon">
 					{if $galItem->mInfo.content_type_guid != 'fisheyegallery' }
-						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) and $galItem->mInfo.download_url}
+						{if $gBitUser->hasPermission( 'p_treasury_download_item' ) && $galItem->mInfo.download_url}
 							<a href="{$galItem->mInfo.download_url}">{biticon ipackage="icons" iname="emblem-downloads" iexplain="Download File"}</a>
 						{/if}
 						{if $gBitUser->hasPermission( 'p_treasury_view_item' )}
 							<a href="{$galItem->getDisplayUrl()}">{booticon iname="fa-folder-open" iexplain="View File"}</a>
 						{/if}
-						{if $gContent->isOwner( $galItem->mInfo ) or $gBitUser->isAdmin()}
+						{if $gContent->isOwner( $galItem->mInfo ) || $gBitUser->isAdmin()}
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;action=edit">{booticon iname="fa-pencil" iexplain="Edit File"}</a>
 							<a href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?content_id={$galItem->mInfo.content_id}&amp;delete=1">{booticon iname="fa-trash" iexplain="Remove File"}</a>
 						{/if}