Merge pull request #4 from bitshiftersgmbh/bitshiftersgmbh-maintain

release 1.1.2
FriendsOfREDAXO · Feb 18, 2022 · a50c45f · a50c45f
2 parents 807c473 + d257a2b
commit a50c45f
Show file tree

Hide file tree

Showing 5 changed files with 276 additions and 267 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-
+.idea/*
 .DS_Store
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+Version 1.1.2 - 18.02.2022
+--------------------------
+
+* Pfad-Korrektur für aktives CSS-File, wenn Subset ausgewählt ist
+* Backend-Formulare mit korrigierter Form-Action verhindert Probleme mit Installationen in Unterordnern (Packages Page)
+
+> Bitte nach der Installation / dem Update Cache löschen!
+
 Version 1.1.1 - 28.01.2022
 --------------------------
 

diff --git a/lib/rex.fa.iconpicker.php b/lib/rex.fa.iconpicker.php
@@ -178,7 +178,8 @@ public static function getCssUrl(): ?string {
      * @author Peter Schulze | p.schulze[at]bitshifters.de
      */
     public static function getActiveCssFileName(): ?string {
-        $basePath = rex_fa_package::PACKAGE_PATH.self::getActiveVariant().DIRECTORY_SEPARATOR.self::getActiveVariant()."-".self::getActiveVersion();
+        $basePath = rex_fa_package::PACKAGE_PATH.self::getActiveVariant().DIRECTORY_SEPARATOR.self::getActiveVariant()."-".self::getActiveVersion().
+                    (self::getActiveSubset() != "" ? "-".self::getActiveSubset() : "");
 
         if(file_exists(rex_path::data($basePath.DIRECTORY_SEPARATOR.'css'.DIRECTORY_SEPARATOR.self::ALL_MIN_CSS))) {
             return self::ALL_MIN_CSS;

diff --git a/package.yml b/package.yml
@@ -1,5 +1,5 @@
 package: fa_iconpicker
-version: '1.1.1'
+version: '1.1.2'
 author: Friends Of REDAXO
 pjax: false
 supportpage: https://github.com/FriendsOfREDAXO/fa_iconpicker/