Resolves #211

intelliants · Oct 3, 2016 · 3235223 · 3235223
1 parent a52e74f
commit 3235223
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 15 deletions.
diff --git a/plugins/personal_blog/docs/changelog.html b/plugins/personal_blog/docs/changelog.html
@@ -1,4 +1,14 @@
 <ul>
+	<li>Version: 4.1.0
+		<ul>
+			<li>Bugfixes:</li>
+			<li><a href="https://github.com/intelliants/subrion/issues/132">Issue 132</a></li>
+			<li><a href="https://github.com/intelliants/subrion/issues/138">Issue 138</a></li>
+			<li><a href="https://github.com/intelliants/subrion/issues/139">Issue 139</a></li>
+			<li><a href="https://github.com/intelliants/subrion/issues/211">Issue 211</a></li>
+			<li>PHP 7 compatibility improvements</li>
+		</ul>
+	</li>
 	<li>Version: 4.0.2
 		<ul>
 			<li>Minor improvements</li>

diff --git a/plugins/personal_blog/index.php b/plugins/personal_blog/index.php
@@ -163,7 +163,7 @@
 			$tags = (iaCore::ACTION_ADD == $pageAction) ? '' : $iaBlog->getTagsString($id);
 
 			$iaView->assign('item', $entry);
-			$iaView->assign('tags', $tags);
+			$iaView->assign('blog_entry_tags', $tags);
 
 			break;
 
@@ -224,7 +224,7 @@
 
 				$iaView->set('og', $openGraph);
 
-				$iaView->assign('tags', $iaBlog->getTags($id));
+				$iaView->assign('blog_tags', $iaBlog->getTags($id));
 				$iaView->assign('blog_entry', $entry);
 
 				if ($iaAcl->isAccessible(iaBlog::PAGE_NAME, iaCore::ACTION_EDIT) && iaUsers::hasIdentity()
@@ -258,7 +258,7 @@
 				$entries = $iaBlog->get($pagination['start'], $pagination['limit']);
 				$pagination['total'] = $iaDb->foundRows();
 
-				$iaView->assign('tags', $iaBlog->getAllTags());
+				$iaView->assign('blog_tags', $iaBlog->getAllTags());
 				$iaView->assign('blog_entries', $entries);
 				$iaView->assign('pagination', $pagination);
 			}

diff --git a/plugins/personal_blog/install.xml b/plugins/personal_blog/install.xml
@@ -4,9 +4,9 @@
 	<summary>Allows to create a personal admin blog</summary>
 	<author>Intelliants LLC</author>
 	<contributor>Intelliants LLC</contributor>
-	<version>4.0.2</version>
-	<date>2016-02-15</date>
-	<compatibility>4.0</compatibility>
+	<version>4.1.0</version>
+	<date>2016-09-26</date>
+	<compatibility>4.1</compatibility>
 
 	<actions>
 		<action name="blogs" url="blog/" icon="list" pages="personal_blog:add,personal_blog:edit">List</action>

diff --git a/plugins/personal_blog/tag.php b/plugins/personal_blog/tag.php
@@ -117,7 +117,7 @@
 		$tags = $iaDb->getAll($sql);
 		$pagination['total'] = $iaDb->foundRows();
 
-		$iaView->assign('tags', $tags);
+		$iaView->assign('blog_tags', $tags);
 		$iaView->assign('pagination', $pagination);
 		$iaView->display('tag');
 	}

diff --git a/plugins/personal_blog/templates/front/index.tpl b/plugins/personal_blog/templates/front/index.tpl
@@ -9,9 +9,9 @@
 
 	<div class="tags">
 		<span class="fa fa-tags"></span>
-		{if $tags}
+		{if $blog_tags}
 			{lang key='tags'}:
-			{foreach $tags as $tag}
+			{foreach $blog_tags as $tag}
 				<a href="{$smarty.const.IA_URL}tag/{$tag.alias}">{$tag.title|escape:'html'}</a>{if !$tag@last}, {/if}
 			{/foreach}
 		{else}
@@ -44,15 +44,15 @@
 						</h4>
 						<div class="ia-item__additional">
 							<p><span class="fa fa-tags"></span>
-							{if $tags}
+							{if $blog_tags}
 								{$tagsExist=0}
-								{foreach $tags as $tag}
+								{foreach $blog_tags as $tag}
 									{if $blog_entry.id == $tag.blog_id}
 										{$tagsExist = $tagsExist + 1}
 									{/if}
 								{/foreach}
 								{if $tagsExist != 0}
-									{foreach $tags as $tag}
+									{foreach $blog_tags as $tag}
 										{if $blog_entry.id == $tag.blog_id}
 											<a href="{$smarty.const.IA_URL}tag/{$tag.alias}">{$tag.title|escape: 'html'}</a>
 										{/if}

diff --git a/plugins/personal_blog/templates/front/manage.tpl b/plugins/personal_blog/templates/front/manage.tpl
@@ -28,7 +28,7 @@
 
 						<div class="form-group">
 							<label for="input-tag">{lang key='tags'}</label>
-							<input class="form-control" type="text" name="tags" value="{$tags|escape:'html'}" id="input-tag">
+							<input class="form-control" type="text" name="tags" value="{$blog_entry_tags|escape:'html'}" id="input-tag">
 							<p class="help-block text-break-word" id="title_box">{lang key='separate_with_comma_or_enter'}</p>
 						</div>
 

diff --git a/plugins/personal_blog/templates/front/tag.tpl b/plugins/personal_blog/templates/front/tag.tpl
@@ -17,8 +17,8 @@
 	{/foreach}
 	{navigation aTotal=$pagination.total aTemplate=$pagination.template aItemsPerPage=$core.config.blog_number aNumPageItems=5}
 {else}
-	{if $tags}
-		{foreach $tags as $tag}
+	{if $blog_tags}
+		{foreach $blog_tags as $tag}
 			{if $tag != ''}
 				<div class="media ia-item">
 					<div class="media-body">