From 298f720d04f43b7881044ae19944480555139160 Mon Sep 17 00:00:00 2001 From: Axel Krysztofiak Date: Tue, 19 Nov 2024 21:05:22 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Mediakategorie-B=C3=BCndelung=20darf=20nur?= =?UTF-8?q?=20passieren,=20wenn=20Medienkategorie-Tabelle=20genutzt=20wird?= =?UTF-8?q?.=20fixes=20#24?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/Modules/Pictures.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/Modules/Pictures.php b/lib/Modules/Pictures.php index df915f3..7919fd4 100644 --- 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'; } } From 912d9c321adc325934b356acf60cbacce396063a Mon Sep 17 00:00:00 2001 From: Axel Krysztofiak Date: Tue, 19 Nov 2024 21:11:08 +0100 Subject: [PATCH 2/3] release notes --- pages/release_notes/de/_3.2.3.php | 4 ++++ pages/release_notes/en/_3.2.3.php | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 pages/release_notes/de/_3.2.3.php create mode 100644 pages/release_notes/en/_3.2.3.php diff --git a/pages/release_notes/de/_3.2.3.php b/pages/release_notes/de/_3.2.3.php new file mode 100644 index 0000000..27379d2 --- /dev/null +++ b/pages/release_notes/de/_3.2.3.php @@ -0,0 +1,4 @@ + + diff --git a/pages/release_notes/en/_3.2.3.php b/pages/release_notes/en/_3.2.3.php new file mode 100644 index 0000000..abfbb60 --- /dev/null +++ b/pages/release_notes/en/_3.2.3.php @@ -0,0 +1,4 @@ + + From 5335d33e1cb35357128c195a912cc2f68ad19c60 Mon Sep 17 00:00:00 2001 From: Axel Krysztofiak Date: Tue, 19 Nov 2024 21:12:36 +0100 Subject: [PATCH 3/3] Release 3.2.3 --- package.yml | 2 +- pages/release_notes/de/{_3.2.3.php => 2024-11-19_3.2.3.php} | 0 pages/release_notes/en/{_3.2.3.php => 2024-11-19_3.2.3.php} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename pages/release_notes/de/{_3.2.3.php => 2024-11-19_3.2.3.php} (100%) rename pages/release_notes/en/{_3.2.3.php => 2024-11-19_3.2.3.php} (100%) diff --git a/package.yml b/package.yml index 8c84587..209c2ff 100644 --- 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/_3.2.3.php b/pages/release_notes/de/2024-11-19_3.2.3.php similarity index 100% rename from pages/release_notes/de/_3.2.3.php rename to pages/release_notes/de/2024-11-19_3.2.3.php diff --git a/pages/release_notes/en/_3.2.3.php b/pages/release_notes/en/2024-11-19_3.2.3.php similarity index 100% rename from pages/release_notes/en/_3.2.3.php rename to pages/release_notes/en/2024-11-19_3.2.3.php