Removing tag_list_language_filter option

joomla · Nov 3, 2022 · 0d7ed82 · 0d7ed82
1 parent 5a7073a
commit 0d7ed82
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 71 deletions.
diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
@@ -201,16 +201,6 @@
 			filter="integer"
 		/>
 
-		<field
-			name="tag_list_language_filter"
-			type="contentlanguage"
-			label="COM_TAGS_FIELD_LANGUAGE_FILTER_LABEL"
-			default="all"
-			>
-			<option value="all">JALL</option>
-			<option value="current_language">JCURRENT</option>
-		</field>
-
 	</fieldset>
 
 	<fieldset

diff --git a/components/com_content/tmpl/category/default_articles.php b/components/com_content/tmpl/category/default_articles.php
@@ -34,20 +34,7 @@
 
 // Tags filtering based on language filter
 if (($this->params->get('filter_field') === 'tag') && (Multilanguage::isEnabled())) {
-    $tagfilter = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter');
-
-    switch ($tagfilter) {
-        case 'current_language':
-            $langFilter = Factory::getApplication()->getLanguage()->getTag();
-            break;
-
-        case 'all':
-            $langFilter = false;
-            break;
-
-        default:
-            $langFilter = $tagfilter;
-    }
+    $langFilter = Factory::getApplication()->getLanguage()->getTag();
 }
 
 // Check for at least one editable article

diff --git a/components/com_tags/src/Model/TagModel.php b/components/com_tags/src/Model/TagModel.php
@@ -145,14 +145,9 @@ protected function getListQuery()
         $includeChildren = $this->state->params->get('include_children', 0);
         $orderDir = $this->getState('list.direction', 'ASC');
         $matchAll = $this->getState('params')->get('return_any_or_all', 1);
-        $language = $this->getState('tag.language');
+        $language = $this->getState('tag.language', 'all');
         $stateFilter = $this->getState('tag.state');
 
-        // Optionally filter on language
-        if (empty($language)) {
-            $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
-        }
-
         $query = (new TagsHelper())->getTagItemsQuery($tagId, $typesr, $includeChildren, $orderByOption, $orderDir, $matchAll, $language, $stateFilter);
 
         if ($this->state->get('list.filter')) {

diff --git a/components/com_tags/src/Model/TagsModel.php b/components/com_tags/src/Model/TagsModel.php
@@ -56,9 +56,6 @@ protected function populateState($ordering = null, $direction = null)
         $pid = $app->getInput()->getInt('parent_id');
         $this->setState('tag.parent_id', $pid);
 
-        $language = $app->getInput()->getString('tag_list_language_filter');
-        $this->setState('tag.language', $language);
-
         $offset = $app->getInput()->get('limitstart', 0, 'uint');
         $this->setState('list.offset', $offset);
         $app = Factory::getApplication();

diff --git a/libraries/src/Form/Field/TagField.php b/libraries/src/Form/Field/TagField.php
@@ -148,9 +148,7 @@ protected function getOptions()
 
         // Limit Options in multilanguage
         if ($app->isClient('site') && Multilanguage::isEnabled()) {
-            if (ComponentHelper::getParams('com_tags')->get('tag_list_language_filter') === 'current_language') {
-                $language = [$app->getLanguage()->getTag(), '*'];
-            }
+            $language = [$app->getLanguage()->getTag(), '*'];
         } elseif (isset($this->element['language'])) {
             // Filter language
             $language = explode(',', $this->element['language']);

diff --git a/libraries/src/Helper/TagsHelper.php b/libraries/src/Helper/TagsHelper.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Table\CoreContent;
 use Joomla\CMS\Table\Table;
 use Joomla\CMS\Table\TableInterface;
@@ -343,14 +344,9 @@ public function getItemTags($contentType, $id, $getTagData = true)
 
         $query->whereIn($db->quoteName('t.access'), $groups);
 
-        // Optionally filter on language
-        $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
-
-        if ($language !== 'all') {
-            if ($language === 'current_language') {
-                $language = $this->getCurrentLanguage();
-            }
-
+        // Filter on language
+        if (Multilanguage::isEnabled()) {
+            $language = $this->getCurrentLanguage();
             $query->whereIn($db->quoteName('language'), [$language, '*'], ParameterType::STRING);
         }
 
@@ -404,14 +400,9 @@ public function getMultipleItemTags($contentType, array $ids, $getTagData = true
 
         $query->whereIn($db->quoteName('t.access'), $groups);
 
-        // Optionally filter on language
-        $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
-
-        if ($language !== 'all') {
-            if ($language === 'current_language') {
-                $language = $this->getCurrentLanguage();
-            }
-
+        // Filter on language
+        if (Multilanguage::isEnabled()) {
+            $language = $this->getCurrentLanguage();
             $query->whereIn($db->quoteName('language'), [$language, '*'], ParameterType::STRING);
         }
 
@@ -632,9 +623,7 @@ public function getTagItemsQuery(
 
         // Optionally filter on language
         if ($languageFilter !== 'all') {
-            if ($languageFilter === 'current_language') {
-                $languageFilter = $this->getCurrentLanguage();
-            }
+            $languageFilter = $this->getCurrentLanguage();
 
             $query->whereIn($db->quoteName('c.core_language'), [$languageFilter, '*'], ParameterType::STRING);
         }

diff --git a/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php b/modules/mod_tags_popular/src/Helper/TagsPopularHelper.php
@@ -13,6 +13,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Language\Multilanguage;
 use Joomla\Database\ParameterType;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -88,14 +89,9 @@ public static function getList(&$params)
 
         $query->where($db->quoteName('cat.published') . ' > 0');
 
-        // Optionally filter on language
-        $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
-
-        if ($language !== 'all') {
-            if ($language === 'current_language') {
-                $language = ContentHelper::getCurrentLanguage();
-            }
-
+        // Filter on language
+        if (Multilanguage::isEnabled()) {
+            $language = ContentHelper::getCurrentLanguage();
             $query->whereIn($db->quoteName('t.language'), [$language, '*'], ParameterType::STRING);
         }
 

diff --git a/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php b/modules/mod_tags_similar/src/Helper/TagsSimilarHelper.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Helper\ContentHelper;
 use Joomla\CMS\Helper\TagsHelper;
+use Joomla\CMS\Language\Multilanguage;
 use Joomla\CMS\Language\Text;
 use Joomla\Component\Tags\Site\Helper\RouteHelper;
 use Joomla\Database\ParameterType;
@@ -146,14 +147,9 @@ public static function getList(&$params)
             ->bind(':nullDateDown', $nullDate)
             ->bind(':nowDateDown', $now);
 
-        // Optionally filter on language
-        $language = ComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
-
-        if ($language !== 'all') {
-            if ($language === 'current_language') {
-                $language = ContentHelper::getCurrentLanguage();
-            }
-
+        // Filter on language
+        if (Multilanguage::isEnabled()) {
+            $language = ContentHelper::getCurrentLanguage();
             $query->whereIn($db->quoteName('cc.core_language'), [$language, '*'], ParameterType::STRING);
         }