Merge branch 'hotfix/1.11.1'

abrain · Apr 1, 2024 · 492331d · 492331d
2 parents d10c86c + 89c44e3
commit 492331d
Show file tree

Hide file tree

Showing 8 changed files with 88 additions and 22 deletions.
diff --git a/src/Admin/Initializer.php b/src/Admin/Initializer.php
@@ -120,21 +120,21 @@ public function enqueueEditScripts($hook)
         }
 
         wp_enqueue_style(
-            'font-awesome',
+            'einsatzverwaltung-font-awesome',
             Core::$pluginUrl . 'font-awesome/css/fontawesome.min.css',
             false,
             '6.2.1'
         );
         wp_enqueue_style(
-            'font-awesome-solid',
+            'einsatzverwaltung-font-awesome-solid',
             Core::$pluginUrl . 'font-awesome/css/solid.min.css',
-            array('font-awesome'),
+            array('einsatzverwaltung-font-awesome'),
             '6.2.1'
         );
         wp_enqueue_style(
-            'font-awesome-brands',
+            'einsatzverwaltung-font-awesome-brands',
             Core::$pluginUrl . 'font-awesome/css/brands.min.css',
-            array('font-awesome'),
+            array('einsatzverwaltung-font-awesome'),
             '6.2.1'
         );
         wp_enqueue_style(

diff --git a/src/Core.php b/src/Core.php
@@ -19,8 +19,8 @@
  */
 class Core
 {
-    const VERSION = '1.11.0';
-    const DB_VERSION = 72;
+    const VERSION = '1.11.1';
+    const DB_VERSION = 80;
 
     /**
      * Statische Variable, um die aktuelle (einzige!) Instanz dieser Klasse zu halten

diff --git a/src/Frontend.php b/src/Frontend.php
@@ -70,18 +70,21 @@ public function addHooks()
      */
     public function enqueueStyleAndScripts()
     {
-        wp_enqueue_style(
-            'font-awesome',
-            Core::$pluginUrl . 'font-awesome/css/fontawesome.min.css',
-            false,
-            '6.2.1'
-        );
-        wp_enqueue_style(
-            'font-awesome-solid',
-            Core::$pluginUrl . 'font-awesome/css/solid.min.css',
-            array('font-awesome'),
-            '6.2.1'
-        );
+        if (get_option('einsatzvw_disable_fontawesome') !== '1') {
+            wp_enqueue_style(
+                'einsatzverwaltung-font-awesome',
+                Core::$pluginUrl . 'font-awesome/css/fontawesome.min.css',
+                false,
+                '6.2.1'
+            );
+            wp_enqueue_style(
+                'einsatzverwaltung-font-awesome-solid',
+                Core::$pluginUrl . 'font-awesome/css/solid.min.css',
+                array('einsatzverwaltung-font-awesome'),
+                '6.2.1'
+            );
+        }
+
         wp_enqueue_style(
             'einsatzverwaltung-frontend',
             Core::$styleUrl . 'style-frontend.css',

diff --git a/src/Settings/Pages/Advanced.php b/src/Settings/Pages/Advanced.php
@@ -76,6 +76,13 @@ public function addSettingsFields()
             $this->settingsApiPage,
             'einsatzvw_settings_advreport'
         );
+        add_settings_field(
+            'einsatzvw_compatibility_fontawesome',
+            __('Font Awesome', 'einsatzverwaltung'),
+            array($this, 'echoFieldFontAwesome'),
+            $this->settingsApiPage,
+            'einsatzvw_settings_advanced_compatibility'
+        );
     }
 
     public function addSettingsSections()
@@ -112,6 +119,12 @@ function () {
             null,
             $this->settingsApiPage
         );
+        add_settings_section(
+            'einsatzvw_settings_advanced_compatibility',
+            __('Compatibility', 'einsatzverwaltung'),
+            null,
+            $this->settingsApiPage
+        );
     }
 
     /**
@@ -174,6 +187,20 @@ public function echoFieldCoreFeatures()
         echo '</fieldset>';
     }
 
+    public function echoFieldFontAwesome()
+    {
+        echo '<fieldset>';
+        $this->echoSettingsCheckbox(
+            'einsatzvw_disable_fontawesome',
+            __('Disable Font Awesome', 'einsatzverwaltung')
+        );
+        printf(
+            '<p class="description">%s</p>',
+            esc_html__('If the icons are not shown correctly, there may be a collision with another installed version of Font Awesome. You can try and deactivate this plugin\'s version. This will not affect the admin area.', 'einsatzverwaltung')
+        );
+        echo '</fieldset>';
+    }
+
     public function echoFieldGutenberg()
     {
         echo '<fieldset>';
@@ -265,5 +292,10 @@ public function registerSettings()
             'einsatz_disable_blockeditor',
             array(Utilities::class, 'sanitizeCheckbox')
         );
+        register_setting(
+            'einsatzvw_settings_advanced',
+            'einsatzvw_disable_fontawesome',
+            array(Utilities::class, 'sanitizeCheckbox')
+        );
     }
 }
diff --git a/src/Update.php b/src/Update.php
@@ -129,6 +129,10 @@ public function doUpdate(int $currentDbVersion, int $targetDbVersion)
         if ($currentDbVersion < 72 && $targetDbVersion >= 72) {
             $this->upgrade1102();
         }
+
+        if ($currentDbVersion < 80 && $targetDbVersion >= 80) {
+            $this->upgrade1111();
+        }
     }
 
     /**
@@ -669,6 +673,16 @@ public function upgrade1102()
         update_option('einsatzvw_db_version', 72);
     }
 
+    /**
+     * @since 1.11.1
+     */
+    public function upgrade1111()
+    {
+        add_option('einsatzvw_disable_fontawesome', '0');
+
+        update_option('einsatzvw_db_version', 80);
+    }
+
     /**
      * Fügt einen Bezeichner für eine Admin Notice der Liste der noch anzuzeigenden Notices hinzu
      *

diff --git a/src/einsatzverwaltung.php b/src/einsatzverwaltung.php
@@ -3,7 +3,7 @@
 Plugin Name: Einsatzverwaltung
 Plugin URI: https://einsatzverwaltung.org
 Description: Public incident reports for fire departments and other rescue services
-Version: 1.11.0
+Version: 1.11.1
 Author: Andreas Brain
 Author URI: https://www.abrain.de
 License: GPLv2

diff --git a/src/readme.txt b/src/readme.txt
@@ -3,9 +3,9 @@ Contributors: abrain
 Donate link: https://einsatzverwaltung.org/unterstuetzen/
 Tags: Feuerwehr, fire department, EMS
 Requires at least: 5.6.0
-Tested up to: 6.4
+Tested up to: 6.5
 Requires PHP: 7.1.0
-Stable tag: 1.11.0
+Stable tag: 1.11.1
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -52,6 +52,10 @@ Yes, you can find them on [our website](https://einsatzverwaltung.org/faq/).
 
 == Changelog ==
 
+= 1.11.1 =
+* Reduce collisions with other occurrences of Font Awesome
+* Add option to disable Font Awesome
+
 = 1.11.0 =
 * Alerting Methods: Can now be linked with a page from the same site or an arbitrary URL
 * Shortcode `reportcount` can ignore weights
@@ -75,6 +79,9 @@ Yes, you can find them on [our website](https://einsatzverwaltung.org/faq/).
 * Fix: Changing the category setting for incident reports caused an error on fresh installations
 
 == Upgrade Notice ==
+= 1.11.1 =
+Maintenance Release
+
 = 1.11.0 =
 Minor enhancements, upgraded Font Awesome, improved compatibility with PHP 8.2
 

diff --git a/tests/unit/UpdateTest.php b/tests/unit/UpdateTest.php
@@ -204,4 +204,14 @@ public function testUpgrade1102Foo()
         expect('update_option')->once()->with('einsatzvw_db_version', 72);
         (new Update())->upgrade1102();
     }
+
+    /**
+     * @throws ExpectationArgsRequired
+     */
+    public function testUpgrade1111AddsOptionDefault()
+    {
+        expect('add_option')->once()->with('einsatzvw_disable_fontawesome', '0');
+        expect('update_option')->once()->with('einsatzvw_db_version', 80);
+        (new Update())->upgrade1111();
+    }
 }