Merge branch 'develop'

akrys · Nov 19, 2024 · dab4405 · dab4405
2 parents f35cc34 + 5335d33
commit dab4405
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/lib/Modules/Pictures.php b/lib/Modules/Pictures.php
@@ -406,7 +406,7 @@ private function addArtSelectAndJoinStatements(array &$return, string $joinArtMe
 			$return['additionalJoins'] .= 'LEFT join rex_article as rex_article_art_meta on '.
 				'(rex_article_art_meta.id is not null and ('.$joinArtMeta.'))'.PHP_EOL;
 
-			$return['groupBy'] .= 'rex_article_art_meta.id,rex_article_cat_meta.id';
+			$return['groupBy'] .= (empty($return['groupBy']) ? '' : ',').'rex_article_art_meta.id';
 		}
 	}
 
@@ -441,6 +441,8 @@ private function addCatSelectAndJoinStatements(array &$return, string $joinCatMe
 		if ($joinCatMeta != '') {
 			$return['additionalJoins'] .= 'LEFT join rex_article as rex_article_cat_meta on '.
 				'(rex_article_cat_meta.id is not null and ('.$joinCatMeta.'))'.PHP_EOL;
+
+			$return['groupBy'] .= (empty($return['groupBy']) ? '' : ',').'rex_article_cat_meta.id';
 		}
 	}
 

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: usage_check
-version: '3.2.2'
+version: '3.2.3'
 author: Axel Krysztofiak
 supportpage: https://github.com/akrys/redaxo-usage_check
 #load: early

diff --git a/pages/release_notes/de/2024-11-19_3.2.3.php b/pages/release_notes/de/2024-11-19_3.2.3.php
@@ -0,0 +1,4 @@
+
+<ul>
+	<li>Bugfix: möglicher SQL-Fehler, wenn Mediankategorien im SQL nicht benötigt werden.</li>
+</ul>
diff --git a/pages/release_notes/en/2024-11-19_3.2.3.php b/pages/release_notes/en/2024-11-19_3.2.3.php
@@ -0,0 +1,4 @@
+
+<ul>
+	<li>Bugfix: posible SQL error, if media category table is not needed.</li>
+</ul>