8 files changed, 11 insertions, 11 deletions
diff --git a/templates/mime/audio/attachment.tpl b/templates/mime/audio/attachment.tpl
index 08f6400..844e71a 100755
--- a/templates/mime/audio/attachment.tpl
+++ b/templates/mime/audio/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
 	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 		{$wrapper.description_parsed|default:$attachment.filename}
 	{if $attachment.display_url}</a>{/if}
diff --git a/templates/mime/audio/player.tpl b/templates/mime/audio/player.tpl
index a37fc2e..18701f3 100755
--- a/templates/mime/audio/player.tpl
+++ b/templates/mime/audio/player.tpl
@@ -13,7 +13,7 @@
 	{/if}
 	<div id="{$id}"><a href="http://www.macromedia.com/go/getflashplayer">Get the Flash Player</a> to see this video.</div>
 	<script>/* <![CDATA[ */
-		{if !$attachment.thumbnail_is_mime and $attachment.thumbnail_url.medium}
+		{if !$attachment.thumbnail_is_mime && $attachment.thumbnail_url.medium}
 			var so = new SWFObject('{$smarty.const.UTIL_PKG_URL}javascript/flv_player/mediaplayer.swf','mpl','{$width}','{$height}','7');
 			so.addVariable("image","{$attachment.thumbnail_url.medium}");
 		{else}
diff --git a/templates/mime/default/attachment.tpl b/templates/mime/default/attachment.tpl
index b31c677..f5272c8 100755
--- a/templates/mime/default/attachment.tpl
+++ b/templates/mime/default/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
 	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 		{$wrapper.description_parsed|default:$attachment.filename|strip_tags}
 	{if $attachment.display_url}</a>{/if}
@@ -7,9 +7,9 @@
 	<{$wrapper.wrapper|default:'span'} class="{$wrapper.class|default:'att-plugin'}"{if $wrapper.style} style="{$wrapper.style|default:'display:inline-block'}{/if}">
 		{if $wrapper.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url}">{/if}
 			{if $thumbsize == 'original'}
-				<img class="img-responsive" src="{$attachment.source_url}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) or !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if} />
+				<img class="img-responsive" src="{$attachment.source_url}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) || !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if} />
 			{elseif $attachment.thumbnail_url.$thumbsize}
-				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) or !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if}/>
+				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$wrapper.alt|default:$wrapper.description|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" title="{$wrapper.description|default:$wrapper.alt|default:$attachment.filename|replace:"\r":""|replace:"\n":" "|escape}" {if !empty($height) || !empty($width)} style="{if !empty($height)}height:{$height};{/if}{if !empty($width)}width:{$width}{/if}"{/if}/>
 			{/if}
 			{if $wrapper.description_parsed}
 				<div class="caption">{$wrapper.description_parsed}</div>
diff --git a/templates/mime/default/inline.tpl b/templates/mime/default/inline.tpl
index 3823b81..d9992bc 100644
--- a/templates/mime/default/inline.tpl
+++ b/templates/mime/default/inline.tpl
@@ -2,7 +2,7 @@
 <div class="item">
 	{assign var=thumbsize value=$thumbsize|default:'small'}
 	{if $attachment.thumbnail_url.$thumbsize}
-		{if !$attachment.is_primary or ( $attachment.is_primary and !$hideprimary )}
+		{if !$attachment.is_primary || ( $attachment.is_primary && !$hideprimary )}
 			<a href="{$attachment.display_url}">
 				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
 			</a>
diff --git a/templates/mime/default/storage.tpl b/templates/mime/default/storage.tpl
index 3823b81..d9992bc 100644
--- a/templates/mime/default/storage.tpl
+++ b/templates/mime/default/storage.tpl
@@ -2,7 +2,7 @@
 <div class="item">
 	{assign var=thumbsize value=$thumbsize|default:'small'}
 	{if $attachment.thumbnail_url.$thumbsize}
-		{if !$attachment.is_primary or ( $attachment.is_primary and !$hideprimary )}
+		{if !$attachment.is_primary || ( $attachment.is_primary && !$hideprimary )}
 			<a href="{$attachment.display_url}">
 				<img class="img-responsive" src="{$attachment.thumbnail_url.$thumbsize}" alt="{$attachment.filename}" title="{$attachment.filename}"/>
 			</a>
diff --git a/templates/mime/image/admin.tpl b/templates/mime/image/admin.tpl
index 8da6d45..ffeabcd 100755
--- a/templates/mime/image/admin.tpl
+++ b/templates/mime/image/admin.tpl
@@ -8,14 +8,14 @@
 	<div class="body">
 		{form legend="Image specific settings"}
 			{foreach from=$settings key=feature item=output}
-				{if $feature == 'mime_image_panoramas' and $image_processor_warning}
+				{if $feature == 'mime_image_panoramas' && $image_processor_warning}
 					{formfeedback warning="This feature is only available when using the magickwand image processor."}
 				{/if}
 				<div class="form-group">
 					{formlabel label=`$output.label` for=$feature}
 					{forminput}
 						{if $output.type == 'checkbox'}
-							{if $feature == 'mime_image_panoramas' and $image_processor_warning}
+							{if $feature == 'mime_image_panoramas' && $image_processor_warning}
 								{html_checkboxes name="$feature" values="y" labels=false id=$feature disabled="disabled"}
 							{else}
 								{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
diff --git a/templates/mime/image/attachment.tpl b/templates/mime/image/attachment.tpl
index b9713de..96451db 100755
--- a/templates/mime/image/attachment.tpl
+++ b/templates/mime/image/attachment.tpl
@@ -1,6 +1,6 @@
 {strip}
 {if $attachment.thumbnail_url.panorama}
-	{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
+	{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
 		{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 			{$wrapper.description_parsed|default:$attachment.filename}
 		{if $attachment.display_url}</a>{/if}
diff --git a/templates/mime/video/attachment.tpl b/templates/mime/video/attachment.tpl
index bd52c64..485bfff 100755
--- a/templates/mime/video/attachment.tpl
+++ b/templates/mime/video/attachment.tpl
@@ -1,5 +1,5 @@
 {strip}
-{if $wrapper.output == 'desc' or $wrapper.output == 'description'}
+{if $wrapper.output == 'desc' || $wrapper.output == 'description'}
 	{if $attachment.display_url}<a {$wrapper.href_class} href="{$wrapper.display_url|default:$attachment.display_url}">{/if}
 		{$wrapper.description_parsed|default:$attachment.filename}
 	{if $attachment.display_url}</a>{/if}