From 238fcd7afd3442c7eccf19f8476b2399be00b94f Mon Sep 17 00:00:00 2001
From: Lester Caine <lester@lsces.co.uk>
Date: Sun, 7 Jun 2026 16:51:54 +0100
Subject: Remove duplicate ipackage attributes from biticon calls

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 templates/center_list_newsletters.tpl | 10 +++++-----
 templates/list_editions_inc.tpl       |  2 +-
 templates/list_newsletters.tpl        |  6 +++---
 templates/view_edition.tpl            |  6 +++---
 templates/view_newsletter.tpl         |  8 ++++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/templates/center_list_newsletters.tpl b/templates/center_list_newsletters.tpl
index 12c3d41..0fd3e9c 100755
--- a/templates/center_list_newsletters.tpl
+++ b/templates/center_list_newsletters.tpl
@@ -74,16 +74,16 @@
 							<strong>{biticon ipackage="icons" iname="process-stop" iexplain="Success" iforce="icon"}{tr}Unsubscribed{/tr}: {$subs.$nlId.unsubscribe_date|bit_short_date}</strong><br/>
 							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}sub.php?nl_id={$nl.nl_id}&amp;sub=1">{tr}Subscribe{/tr}</a>
 						{elseif $subs.$nlId}
-							<strong>{biticon ipackage="icons" iname="dialog-ok"  ipackage="icons"  iexplain="Success" iforce="icon"}{tr}Subscribed{/tr}: {$subs.$nlId.subscribed_date|bit_short_date}</strong><br/>
+							<strong>{biticon ipackage="icons" iname="dialog-ok"  iexplain="Success" iforce="icon"}{tr}Subscribed{/tr}: {$subs.$nlId.subscribed_date|bit_short_date}</strong><br/>
 							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}sub.php?nl_id={$nl.nl_id}&amp;unsub=1">{tr}Unsubscribe{/tr}</a>
 						{else}
 							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}sub.php?nl_id={$nl.nl_id}&amp;sub=1">{tr}Subscribe{/tr}</a>
 						{/if}
 						{if $gBitUser->hasPermission('p_newsletters_create')}
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="view-list-text" ipackage="icons" iexplain="New Edition"}</a>
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="edit" ipackage="icons" iexplain=Edit}</a>
-							{if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title|escape}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{biticon ipackage="icons" iname="lock" ipackage="icons" iexplain=Permissions}</a>{if $nl.individual eq 'y'}){/if}
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?remove=1&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="user-trash" ipackage="icons" iexplain=Remove}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="view-list-text" iexplain="New Edition"}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="edit" iexplain=Edit}</a>
+							{if $channels[user].individual eq 'y'}({/if}<a href="{$smarty.const.KERNEL_PKG_URL}object_permissions.php?objectName=newsletter%20{$nl.title|escape}&amp;object_type={$smarty.const.BITNEWSLETTER_CONTENT_TYPE_GUID}&amp;permType=newsletters&amp;object_id={$nlId}">{biticon ipackage="icons" iname="lock" iexplain=Permissions}</a>{if $nl.individual eq 'y'}){/if}
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?remove=1&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="user-trash" iexplain=Remove}</a>
 						{/if}
 						</div>
 						<h1>{$nl.title|escape}</h1>
diff --git a/templates/list_editions_inc.tpl b/templates/list_editions_inc.tpl
index 857b4c3..81a2710 100755
--- a/templates/list_editions_inc.tpl
+++ b/templates/list_editions_inc.tpl
@@ -3,7 +3,7 @@
 		<li class="item {cycle values='odd,even'} {$ed.content_type_guid}">
 			<div class="floaticon">
 				{if $gBitUser->hasPermission('p_newsletters_admin')}
-					<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$ed.edition_id}">{biticon ipackage="icons" iname="internet-mail"  ipackage="icons"  iexplain="Send"}</a>
+					<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$ed.edition_id}">{biticon ipackage="icons" iname="internet-mail"  iexplain="Send"}</a>
 			   {/if}
 			</div>
 
diff --git a/templates/list_newsletters.tpl b/templates/list_newsletters.tpl
index ac0c9e3..f800571 100755
--- a/templates/list_newsletters.tpl
+++ b/templates/list_newsletters.tpl
@@ -32,9 +32,9 @@
 						<td>{$nl.last_sent|bit_short_date}</td>
 						<td><a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/admin_newsletter_subscriptions.php?nl_id={$nl.nl_id}"> {$nl.unsub_count|default:0}</a></td>
 						<td style="text-align:right;">
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="view-list-text" ipackage="icons" iexplain="New Edition"}</a>
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?remove=1&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="user-trash" ipackage="icons" iexplain=Remove}</a>
-							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="edit" ipackage="icons" iexplain=Edit}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="view-list-text" iexplain="New Edition"}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?remove=1&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="user-trash" iexplain=Remove}</a>
+							<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?&amp;nl_id={$nl.nl_id}">{biticon ipackage="icons" iname="edit" iexplain=Edit}</a>
 						</td>
 					</tr>
 				{foreachelse}
diff --git a/templates/view_edition.tpl b/templates/view_edition.tpl
index 3518925..3ef0873 100755
--- a/templates/view_edition.tpl
+++ b/templates/view_edition.tpl
@@ -4,11 +4,11 @@
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
 		{if $gBitUser->hasPermission('p_newsletters_admin')}
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$gContent->mEditionId}">{biticon ipackage="icons" iname="internet-mail"  ipackage="icons"  iexplain="email this post"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}admin/send.php?edition_id={$gContent->mEditionId}">{biticon ipackage="icons" iname="internet-mail"  iexplain="email this post"}</a>
 		{/if}
 		{if $gContent->isOwner() || $gBitUser->hasPermission( 'p_newsletters_admin' )}
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?edition_id={$gContent->mEditionId}">{biticon ipackage="icons" iname="edit" ipackage="icons" iexplain="edit"}</a>
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php?edition_id={$gContent->mEditionId}&amp;remove=1">{biticon ipackage="icons" iname="user-trash" ipackage="icons" iexplain="delete"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition_edit.php?edition_id={$gContent->mEditionId}">{biticon ipackage="icons" iname="edit" iexplain="edit"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}edition.php?edition_id={$gContent->mEditionId}&amp;remove=1">{biticon ipackage="icons" iname="user-trash" iexplain="delete"}</a>
 		{/if}
 	</div>
 	{/if}
diff --git a/templates/view_newsletter.tpl b/templates/view_newsletter.tpl
index 186f878..cfd0705 100755
--- a/templates/view_newsletter.tpl
+++ b/templates/view_newsletter.tpl
@@ -3,14 +3,14 @@
 		{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon'}
 
 		{if $gContent->isOwner() || $gBitUser->hasPermission( 'p_newsletters_admin' )}
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}">{biticon ipackage="icons" iname="edit" ipackage="icons" iexplain="edit"}</a>
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}&amp;remove=1">{biticon ipackage="icons" iname="user-trash" ipackage="icons" iexplain="delete"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}">{biticon ipackage="icons" iname="edit" iexplain="edit"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}newsletters.php?nl_id={$gContent->mNewsletterId}&amp;remove=1">{biticon ipackage="icons" iname="user-trash" iexplain="delete"}</a>
 		{/if}
 
 		{if $gBitUser->hasPermission( 'p_liberty_print' )}
-			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}print_blog_post.php?post_id={$post_id}">{biticon ipackage="icons" iname="document-print"  ipackage="icons"  iexplain="print"}</a>
+			<a href="{$smarty.const.NEWSLETTERS_PKG_URL}print_blog_post.php?post_id={$post_id}">{biticon ipackage="icons" iname="document-print"  iexplain="print"}</a>
 		{/if}
-		<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send_newsletter.php?post_id={$post_id}">{biticon ipackage="icons" iname="internet-mail"  ipackage="icons"  iexplain="email this post"}</a>
+		<a href="{$smarty.const.NEWSLETTERS_PKG_URL}send_newsletter.php?post_id={$post_id}">{biticon ipackage="icons" iname="internet-mail"  iexplain="email this post"}</a>
 	</div>
 
 	<div class="header">
-- 
cgit v1.3