Changeset 3255181

Timestamp:

03/13/2025 07:58:49 AM (11 months ago)

Author:

sendsmaily

Message:

Release 1.12.1, see readme.txt for the changelog.

Location:

smaily-for-woocommerce

Files:

• tags/1.12.1 (copied) (copied from smaily-for-woocommerce/trunk)
• tags/1.12.1/inc/Base/Enqueue.php (modified) (3 diffs)
• tags/1.12.1/readme.txt (modified) (2 diffs)
• tags/1.12.1/smaily-for-woocommerce.php (modified) (2 diffs)
• tags/1.12.1/vendor/composer/InstalledVersions.php (modified) (5 diffs)
• tags/1.12.1/vendor/composer/installed.php (modified) (2 diffs)
• trunk/inc/Base/Enqueue.php (modified) (3 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/smaily-for-woocommerce.php (modified) (2 diffs)
• trunk/vendor/composer/InstalledVersions.php (modified) (5 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)

smaily-for-woocommerce/tags/1.12.1/inc/Base/Enqueue.php

@@ -20 +20 @@
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_front_scripts' ) );
-        // Must have low priority to dequeue successfully.
-        add_action( 'admin_enqueue_scripts', array( $this, 'dequeue_admin_styles' ), 100 );
     }
 
@@ -101 +99 @@
         $settings         = apply_filters( 'smaily_settings', $default_settings );
         wp_add_inline_script(
-            'smaily_for_woocommerce-inline',
+            'smaily_for_woocommerce-admin_settings',
             'var smaily_settings = ' . wp_json_encode( $settings ) . ';'
         );
@@ -122 +120 @@
         wp_enqueue_style( 'smaily_for_woocommerce-front_style' );
     }
-
-    /**
-     * Dequeues all 3rd party styles on Smaily module settings page.
-     * Note! This function can be removed once we decide to rework tabs to something other than jQuery UI
-     *
-     * @return void
-     */
-    public function dequeue_admin_styles() {
-
-        $screen = get_current_screen();
-        if ( ! isset( $screen->base ) || $screen->base !== 'toplevel_page_smaily-settings' ) {
-            return;
-        }
-
-        $plugins_dir_url = content_url( 'plugins' );
-        $wp_styles       = wp_styles();
-        foreach ( $wp_styles->queue as $style_handle ) {
-            if ( strpos( $style_handle, 'smaily_for_woocommerce' ) === 0 ) {
-                continue;
-            }
-            $style_src_path = $wp_styles->registered[ $style_handle ]->src;
-
-            if ( strpos( $style_src_path, $plugins_dir_url ) === 0 ) {
-                wp_dequeue_style( $style_handle );
-            }
-        }
-    }
-
 }

smaily-for-woocommerce/tags/1.12.1/readme.txt

@@ -6 +6 @@
 Tested up to: 6.7
 WC tested up to: 9.3.1
-Stable tag: 1.12.0
+Stable tag: 1.12.1
 License: GPLv3
 
@@ -152 +152 @@
 == Changelog ==
 
+= 1.12.1 =
+
+- Stop dequeuing 3rd party styles in module settings page.
+- Fixes RSS feed URL-s not updating when changing settings.
+
 = 1.12.0 =
 

smaily-for-woocommerce/tags/1.12.1/smaily-for-woocommerce.php

@@ -14 +14 @@
  * Plugin URI: https://github.com/sendsmaily/smaily-woocommerce-plugin
  * Description: Smaily email marketing and automation extension plugin for WooCommerce. Set up easy sync for your contacts, add opt-in subscription form, import products directly to your email template and send abandoned cart reminder emails.
- * Version: 1.12.0
+ * Version: 1.12.1
  * License: GPL3
  * Author: Smaily
@@ -49 +49 @@
 define( 'SMAILY_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'SMAILY_PLUGIN_NAME', plugin_basename( __FILE__ ) );
-define( 'SMAILY_PLUGIN_VERSION', '1.12.0' );
+define( 'SMAILY_PLUGIN_VERSION', '1.12.1' );
 
 // Required to use functions is_plugin_active and deactivate_plugins.

smaily-for-woocommerce/tags/1.12.1/vendor/composer/InstalledVersions.php

@@ -32 +32 @@
      */
     private static $installed;
+
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
 
     /**
@@ -310 +315 @@
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
     }
 
@@ -323 +334 @@
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
@@ -331 +345 @@
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
+                }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
                 }
             }
@@ -351 +370 @@
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }

smaily-for-woocommerce/tags/1.12.1/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'smaily/smaily_for_woocommerce',
-        'pretty_version' => '1.12.0',
-        'version' => '1.12.0.0',
-        'reference' => 'd9713a3d2e5742a8954f2502998a97e222bc2135',
+        'pretty_version' => '1.12.1',
+        'version' => '1.12.1.0',
+        'reference' => 'daec98fd5dfbff339eee28571485c2000eae1695',
         'type' => 'plugin',
         'install_path' => __DIR__ . '/../../',
@@ -12 +12 @@
     'versions' => array(
         'smaily/smaily_for_woocommerce' => array(
-            'pretty_version' => '1.12.0',
-            'version' => '1.12.0.0',
-            'reference' => 'd9713a3d2e5742a8954f2502998a97e222bc2135',
+            'pretty_version' => '1.12.1',
+            'version' => '1.12.1.0',
+            'reference' => 'daec98fd5dfbff339eee28571485c2000eae1695',
             'type' => 'plugin',
             'install_path' => __DIR__ . '/../../',

smaily-for-woocommerce/trunk/inc/Base/Enqueue.php

@@ -20 +20 @@
         add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
         add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_front_scripts' ) );
-        // Must have low priority to dequeue successfully.
-        add_action( 'admin_enqueue_scripts', array( $this, 'dequeue_admin_styles' ), 100 );
     }
 
@@ -101 +99 @@
         $settings         = apply_filters( 'smaily_settings', $default_settings );
         wp_add_inline_script(
-            'smaily_for_woocommerce-inline',
+            'smaily_for_woocommerce-admin_settings',
             'var smaily_settings = ' . wp_json_encode( $settings ) . ';'
         );
@@ -122 +120 @@
         wp_enqueue_style( 'smaily_for_woocommerce-front_style' );
     }
-
-    /**
-     * Dequeues all 3rd party styles on Smaily module settings page.
-     * Note! This function can be removed once we decide to rework tabs to something other than jQuery UI
-     *
-     * @return void
-     */
-    public function dequeue_admin_styles() {
-
-        $screen = get_current_screen();
-        if ( ! isset( $screen->base ) || $screen->base !== 'toplevel_page_smaily-settings' ) {
-            return;
-        }
-
-        $plugins_dir_url = content_url( 'plugins' );
-        $wp_styles       = wp_styles();
-        foreach ( $wp_styles->queue as $style_handle ) {
-            if ( strpos( $style_handle, 'smaily_for_woocommerce' ) === 0 ) {
-                continue;
-            }
-            $style_src_path = $wp_styles->registered[ $style_handle ]->src;
-
-            if ( strpos( $style_src_path, $plugins_dir_url ) === 0 ) {
-                wp_dequeue_style( $style_handle );
-            }
-        }
-    }
-
 }

smaily-for-woocommerce/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.7
 WC tested up to: 9.3.1
-Stable tag: 1.12.0
+Stable tag: 1.12.1
 License: GPLv3
 
@@ -152 +152 @@
 == Changelog ==
 
+= 1.12.1 =
+
+- Stop dequeuing 3rd party styles in module settings page.
+- Fixes RSS feed URL-s not updating when changing settings.
+
 = 1.12.0 =
 

smaily-for-woocommerce/trunk/smaily-for-woocommerce.php

@@ -14 +14 @@
  * Plugin URI: https://github.com/sendsmaily/smaily-woocommerce-plugin
  * Description: Smaily email marketing and automation extension plugin for WooCommerce. Set up easy sync for your contacts, add opt-in subscription form, import products directly to your email template and send abandoned cart reminder emails.
- * Version: 1.12.0
+ * Version: 1.12.1
  * License: GPL3
  * Author: Smaily
@@ -49 +49 @@
 define( 'SMAILY_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
 define( 'SMAILY_PLUGIN_NAME', plugin_basename( __FILE__ ) );
-define( 'SMAILY_PLUGIN_VERSION', '1.12.0' );
+define( 'SMAILY_PLUGIN_VERSION', '1.12.1' );
 
 // Required to use functions is_plugin_active and deactivate_plugins.

smaily-for-woocommerce/trunk/vendor/composer/InstalledVersions.php

@@ -32 +32 @@
      */
     private static $installed;
+
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
 
     /**
@@ -310 +315 @@
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
     }
 
@@ -323 +334 @@
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = strtr(__DIR__, '\\', '/');
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
@@ -331 +345 @@
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
+                }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
                 }
             }
@@ -351 +370 @@
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }

smaily-for-woocommerce/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'smaily/smaily_for_woocommerce',
-        'pretty_version' => '1.12.0',
-        'version' => '1.12.0.0',
-        'reference' => 'd9713a3d2e5742a8954f2502998a97e222bc2135',
+        'pretty_version' => '1.12.1',
+        'version' => '1.12.1.0',
+        'reference' => 'daec98fd5dfbff339eee28571485c2000eae1695',
         'type' => 'plugin',
         'install_path' => __DIR__ . '/../../',
@@ -12 +12 @@
     'versions' => array(
         'smaily/smaily_for_woocommerce' => array(
-            'pretty_version' => '1.12.0',
-            'version' => '1.12.0.0',
-            'reference' => 'd9713a3d2e5742a8954f2502998a97e222bc2135',
+            'pretty_version' => '1.12.1',
+            'version' => '1.12.1.0',
+            'reference' => 'daec98fd5dfbff339eee28571485c2000eae1695',
             'type' => 'plugin',
             'install_path' => __DIR__ . '/../../',