Code style, remove useless code, feature: first Itemid for tags view, second Itemid for default tag view

Author: Tomasz Narloch

components/com_tags/helpers/route.php

@@ -96,7 +96,8 @@ public static function getTagRoute($id)
 			}
 			else
 			{
-				$needles = array('tags' => array(0));
+				$needles = array('tags' => array(1, 0));
+
 				if ($item = self::_findItem($needles))
 				{
 					$link .= '&Itemid=' . $item;
@@ -107,6 +108,29 @@ public static function getTagRoute($id)
 		return $link;
 	}
 
+	/**
+	 * Tries to load the router for the tags view.
+	 *
+	 * @return  string  URL link to pass to JRoute
+	 *
+	 * @since   3.7
+	 */
+	public static function getTagsRoute()
+	{
+		$needles = array(
+			'tags'  => array(0)
+		);
+
+		$link = 'index.php?option=com_tags&view=tags';
+
+		if ($item = self::_findItem($needles))
+		{
+			$link .= '&Itemid=' . $item;
+		}
+
+		return $link;
+	}
+
 	/**
 	 * Find Item static function
 	 *

components/com_tags/router.php

@@ -9,6 +9,8 @@
 
 defined('_JEXEC') or die;
 
+use Joomla\Utilities\ArrayHelper;
+
 /**
  * Routing class from com_tags
  *
@@ -47,7 +49,7 @@ public function build(&$query)
 
 		if (is_array($mId))
 		{
-			JArrayHelper::toInteger($mId);
+			ArrayHelper::toInteger($mId);
 		}
 
 		$view = '';
@@ -101,8 +103,8 @@ public function build(&$query)
 		for ($i = 0; $i < $total; $i++)
 		{
 			$segments[$i] = str_replace(':', '-', $segments[$i]);
+			$position     = strpos($segments[$i], '-');
 
-			$position = strpos($segments[$i], '-');
 			if ($position)
 			{
 				// Remove id from segment
@@ -160,15 +162,14 @@ public function parse(&$segments)
 	 *
 	 * @return  string  The segment with founded id
 	 *
-	 * @since   3.6.1
+	 * @since   3.7
 	*/
 	protected function fixSegment($segment)
 	{
 		$db = JFactory::getDbo();
 
-		// Find or confirm tag id
-		$parts = explode(':', $segment, 2);
-		$alias = implode('-', $parts);
+		// Try to find tag id
+		$alias = str_replace(':', '-', $segment);
 
 		$query = $db->getQuery(true)
 			->select('id')
@@ -177,23 +178,6 @@ protected function fixSegment($segment)
 
 		$id = $db->setQuery($query)->loadResult();
 
-		if (!$id && ctype_digit($parts[0]))
-		{
-			// Alias contains id prefix - old way B/C
-			$alias = $parts[1];
-
-			$query->clear('where')
-				->where($db->quoteName('alias') . " = " . $db->quote($alias));
-
-			$id = $db->setQuery($query)->loadResult();
-
-			if ($parts[0] !== $id)
-			{
-				// Id with incorrect alias
-				return $segment;
-			}
-		}
-
 		if ($id)
 		{
 			$segment = "$id:$alias";