[3.9-alpha] [mod_articles_category] Make sure the tag does not conflict with the title of the article (joomla#21937)

* make sure the tag does not conflict with the title of the article

* Fix ordering (#39)

Author: zero-24

modules/mod_articles_category/helper.php

@@ -516,7 +516,7 @@ public static function groupByDate($list, $type = 'year', $article_grouping_dire
 	public static function groupByTags($list, $direction = 'ksort')
 	{
 		$grouped  = array();
-		$untagged = JText::_('MOD_ARTICLES_CATEGORY_UNTAGGED');
+		$untagged = array();
 
 		if (!$list)
 		{
@@ -534,12 +534,17 @@ public static function groupByTags($list, $direction = 'ksort')
 			}
 			else
 			{
-				$grouped[$untagged][] = $item;
+				$untagged[] = $item;
 			}
 		}
 
 		$direction($grouped);
 
+		if ($untagged)
+		{
+			$grouped['MOD_ARTICLES_CATEGORY_UNTAGGED'] = $untagged;
+		}
+
 		return $grouped;
 	}
 }

modules/mod_articles_category/tmpl/default.php

@@ -14,7 +14,7 @@
 	<?php if ($grouped) : ?>
 		<?php foreach ($list as $group_name => $group) : ?>
 		<li>
-			<div class="mod-articles-category-group"><?php echo $group_name; ?></div>
+			<div class="mod-articles-category-group"><?php echo JText::_($group_name); ?></div>
 			<ul>
 				<?php foreach ($group as $item) : ?>
 					<li>