Merge branch '5.2-dev' into 5.3-dev

joomla · Oct 14, 2024 · 1663f79 · 1663f79
2 parents b400100 + dde18c3
commit 1663f79
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 20 deletions.
diff --git a/modules/mod_articles/mod_articles.xml b/modules/mod_articles/mod_articles.xml
@@ -105,30 +105,28 @@
 					showon="show_child_category_articles:1"
 				/>
 
-				<field
-					name="ex_or_include_articles"
-					type="list"
-					label="MOD_ARTICLES_FIELD_EX_OR_INCLUDE_LABEL"
-					default="0"
-					filter="integer"
-				>
-					<option value="0">MOD_ARTICLES_OPTION_EXCLUDE_VALUE</option>
-					<option value="1">MOD_ARTICLES_OPTION_INCLUDE_VALUE</option>
-				</field>
-
 				<field
 					name="exclude_current"
 					type="radio"
 					label="MOD_ARTICLES_FIELD_EXCLUDE_CURRENT_LABEL"
 					layout="joomla.form.field.radio.switcher"
 					default="1"
 					filter="integer"
-					showon="ex_or_include_articles:0"
 					>
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
 				</field>
 
+				<field
+					name="ex_or_include_articles"
+					type="list"
+					label="MOD_ARTICLES_FIELD_EX_OR_INCLUDE_LABEL"
+					default="0"
+					filter="integer"
+					>
+					<option value="0">MOD_ARTICLES_OPTION_EXCLUDE_VALUE</option>
+					<option value="1">MOD_ARTICLES_OPTION_INCLUDE_VALUE</option>
+				</field>
 
 				<field
 					name="excluded_articles"
@@ -181,7 +179,7 @@
 					type="radio"
 					label="MOD_ARTICLES_FIELD_TITLEONLY_LABEL"
 					layout="joomla.form.field.radio.switcher"
-					default="1"
+					default="0"
 					filter="integer"
 					>
 					<option value="0">JNO</option>

diff --git a/modules/mod_articles/src/Helper/ArticlesHelper.php b/modules/mod_articles/src/Helper/ArticlesHelper.php
@@ -216,27 +216,47 @@ public function getArticles(Registry $params, SiteApplication $app)
         $ex_or_include_articles = $params->get('ex_or_include_articles', 0);
         $filterInclude          = true;
         $articlesList           = [];
+        $currentArticleId       = $input->get('id', 0, 'UINT');
+
+        $isArticleAndShouldExcluded = $params->get('exclude_current', 1) === 1
+            && $input->get('option') === 'com_content'
+            && $input->get('view') === 'article';
 
         $articlesListToProcess = $params->get('included_articles', '');
 
         if ($ex_or_include_articles === 0) {
             $filterInclude = false;
 
-            if (
-                $params->get('exclude_current', 1) === 1
-                && $input->get('option') === 'com_content'
-                && $input->get('view') === 'article'
-            ) {
-                $articlesList[] = $input->get('id', 0, 'UINT');
+            if ($isArticleAndShouldExcluded) {
+                $articlesList[] = $currentArticleId;
             }
 
             $articlesListToProcess = $params->get('excluded_articles', '');
         }
 
         foreach (ArrayHelper::fromObject($articlesListToProcess) as $article) {
+            if (
+                $ex_or_include_articles === 1
+                && $isArticleAndShouldExcluded
+                && (int) $article['id'] === $currentArticleId
+            ) {
+                continue;
+            }
+
             $articlesList[] = (int) $article['id'];
         }
 
+        // Edge case when the user select include mode but didn't add an article,
+        // we might have to exclude the current article
+        if (
+            $ex_or_include_articles === 1
+            && $isArticleAndShouldExcluded
+            && empty($articlesList)
+        ) {
+            $filterInclude  = false;
+            $articlesList[] = $currentArticleId;
+        }
+
         if (!empty($articlesList)) {
             $articles->setState('filter.article_id', $articlesList);
             $articles->setState('filter.article_id.include', $filterInclude);

diff --git a/modules/mod_articles/tmpl/default.php b/modules/mod_articles/tmpl/default.php
@@ -33,7 +33,7 @@
     }
 }
 
-$layoutSuffix = $params->get('title_only', 1) ? '_titles' : '_items';
+$layoutSuffix = $params->get('title_only', 0) ? '_titles' : '_items';
 
 ?>
 <?php if ($grouped) : ?>
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ @@
         }
     }
-    $layoutSuffix = $params->get('title_only', 1) ? '_titles' : '_items';
+    $layoutSuffix = $params->get('title_only', 0) ? '_titles' : '_items';
     ?>
     <?php if ($grouped) : ?>
@@ Expand Down @@