Changeset 3083363

Timestamp:

05/08/2024 01:37:09 PM (23 months ago)

Author:

ShortPixel

Message:

Fix after wrong merge

Location:

fastpixel-website-accelerator

Files:

• tags/1.0.22 (copied) (copied from fastpixel-website-accelerator/trunk)
• tags/1.0.22/README.md (copied) (copied from fastpixel-website-accelerator/trunk/README.md) (1 diff)
• tags/1.0.22/advanced-cache.php (copied) (copied from fastpixel-website-accelerator/trunk/advanced-cache.php)
• tags/1.0.22/composer.json (copied) (copied from fastpixel-website-accelerator/trunk/composer.json)
• tags/1.0.22/composer.lock (copied) (copied from fastpixel-website-accelerator/trunk/composer.lock)
• tags/1.0.22/fastpixel.php (copied) (copied from fastpixel-website-accelerator/trunk/fastpixel.php) (2 diffs)
• tags/1.0.22/icons (copied) (copied from fastpixel-website-accelerator/trunk/icons)
• tags/1.0.22/inc (copied) (copied from fastpixel-website-accelerator/trunk/inc)
• tags/1.0.22/inc/backend/controllers/actions.php (modified) (2 diffs)
• tags/1.0.22/inc/backend/controllers/cache.php (modified) (1 diff)
• tags/1.0.22/inc/backend/models/diag-tests/ac-file.php (modified) (1 diff)
• tags/1.0.22/inc/cache.php (modified) (2 diffs)
• tags/1.0.22/index.php (copied) (copied from fastpixel-website-accelerator/trunk/index.php)
• tags/1.0.22/keys.dev.pub (copied) (copied from fastpixel-website-accelerator/trunk/keys.dev.pub)
• tags/1.0.22/keys.tags.pub (copied) (copied from fastpixel-website-accelerator/trunk/keys.tags.pub)
• tags/1.0.22/languages (copied) (copied from fastpixel-website-accelerator/trunk/languages)
• tags/1.0.22/readme.txt (copied) (copied from fastpixel-website-accelerator/trunk/readme.txt) (2 diffs)
• tags/1.0.22/vendor (copied) (copied from fastpixel-website-accelerator/trunk/vendor)
• tags/1.0.22/vendor/composer/installed.php (modified) (2 diffs)
• trunk/README.md (modified) (1 diff)
• trunk/fastpixel.php (modified) (2 diffs)
• trunk/inc/backend/controllers/actions.php (modified) (2 diffs)
• trunk/inc/backend/controllers/cache.php (modified) (1 diff)
• trunk/inc/backend/models/diag-tests/ac-file.php (modified) (1 diff)
• trunk/inc/cache.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)

fastpixel-website-accelerator/tags/1.0.22/README.md

@@ -5 +5 @@
 Tested up to: 6.4
 Requires PHP: 5.6
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

fastpixel-website-accelerator/tags/1.0.22/fastpixel.php

@@ -5 +5 @@
  * Description: Faster WordPress made easy - the latest technology to speed up your website, packaged in a 1-minute setup plugin.
  * Author:      ShortPixel
- * Version:     1.0.21
+ * Version:     1.0.22
  * Text Domain: fastpixel-website-accelerator
  * Domain Path: /languages
@@ -21 +21 @@
 defined('ABSPATH') || exit;
 
-define('FASTPIXEL_VERSION', '1.0.21');
+define('FASTPIXEL_VERSION', '1.0.22');
 define('FASTPIXEL_NAME', 'FastPixel');
 if (!defined('FASTPIXEL_PLUGIN_DIR'))

fastpixel-website-accelerator/tags/1.0.22/inc/backend/controllers/actions.php

@@ -34 +34 @@
                     $action_class->do_action();
                     //getting action results
-                    $status = $action_class->getStatus();
+                    $status = $action_class->get_status();
                     //displaying error if set
                     if ($status['error']) {
@@ -41 +41 @@
                     //doing redirect if set
                     if ($status['do_redirect']) {
-                        $this->doRedirect($status['redirect_to']);
+                        $this->do_redirect($status['redirect_to']);
                     }
                 }

fastpixel-website-accelerator/tags/1.0.22/inc/backend/controllers/cache.php

@@ -401 +401 @@
                 }
             }
-            echo wp_json_encode(['status' => 'error', 'statusText' => esc_html__('Post ID is wrong or empty', 'fastpixel-website-accelerator')]);
+            echo wp_json_encode(['status' => 'error', 'statusText' => esc_html__('Error occured while requesting cache', 'fastpixel-website-accelerator')]);
             wp_die();
         }

fastpixel-website-accelerator/tags/1.0.22/inc/backend/models/diag-tests/ac-file.php

@@ -20 +20 @@
             if (file_exists(WP_CONTENT_DIR . DIRECTORY_SEPARATOR . 'advanced-cache.php')) {
                 $ac_content = file_get_contents(WP_CONTENT_DIR . DIRECTORY_SEPARATOR . 'advanced-cache.php');
-                if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content)) {
+                if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content) && preg_match('/FASTPIXEL_Config_Model/s', $ac_content)) {
                     $this->passed = true;
+                } else if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content) && !preg_match('/FASTPIXEL_Config_Model/s', $ac_content)) {
+                    /* translators: %s should be an url */
+                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is outdated. %s it with the new FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') . '</a>', $generate_ac_file_url)), 'error');
                 } else {
                     /* translators: %s should be an url */
-                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is not a FastPixel drop-in. %s it with the FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') .'</a>', $generate_ac_file_url)), 'error');
+                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is not a FastPixel drop-in. %s it with the FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') . '</a>', $generate_ac_file_url)), 'error');
                 }
             } else {

fastpixel-website-accelerator/tags/1.0.22/inc/cache.php

@@ -47 +47 @@
             $this->functions = FASTPIXEL_Functions::get_instance();
             $this->config    = FASTPIXEL_Config_Model::get_instance();
-            //moving initialization to mu_plugin_loaded because we need sanitization and escaping function initialized
-            add_action('mu_plugin_loaded', [$this, 'init']);
-        }
-
-        public function init() {
+            
             //loading modules (need them in advanced-cache.php)
             $this->load_modules();
-
             //define FASTPIXEL_REST_URL for backend actions, using hook because during include rest_url throw error
             add_action('init', function () {
@@ -64 +59 @@
                 define('FASTPIXEL_API_URL', FASTPIXEL_API_HOST . '/api/v1/enqueue');
             }
-
             do_action('fastpixel_early_init');
 
+            //moving initialization to mu_plugin_loaded because we need sanitization and escaping function initialized
+            add_action('mu_plugin_loaded', [$this, 'init']);
+        }
+
+        public function init() {
             if (!$this->check_request_agent()) {
                 return;

fastpixel-website-accelerator/tags/1.0.22/readme.txt

@@ -5 +5 @@
 Tested up to: 6.4
 Requires PHP: 5.6
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -148 +148 @@
 Release date: May 8, 2024
 * Fixes for complying with WP guidelines
+
+= 1.0.22 =
+Release date: May 8, 2024
+* Bugfix after wrong merge

fastpixel-website-accelerator/tags/1.0.22/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '6bd5a70c8a80f8dbedc905f398098f0379310ed4',
+        'reference' => '258ef55266a10bc93a17b3be690199a63248223b',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '6bd5a70c8a80f8dbedc905f398098f0379310ed4',
+            'reference' => '258ef55266a10bc93a17b3be690199a63248223b',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

fastpixel-website-accelerator/trunk/README.md

@@ -5 +5 @@
 Tested up to: 6.4
 Requires PHP: 5.6
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

fastpixel-website-accelerator/trunk/fastpixel.php

@@ -5 +5 @@
  * Description: Faster WordPress made easy - the latest technology to speed up your website, packaged in a 1-minute setup plugin.
  * Author:      ShortPixel
- * Version:     1.0.21
+ * Version:     1.0.22
  * Text Domain: fastpixel-website-accelerator
  * Domain Path: /languages
@@ -21 +21 @@
 defined('ABSPATH') || exit;
 
-define('FASTPIXEL_VERSION', '1.0.21');
+define('FASTPIXEL_VERSION', '1.0.22');
 define('FASTPIXEL_NAME', 'FastPixel');
 if (!defined('FASTPIXEL_PLUGIN_DIR'))

fastpixel-website-accelerator/trunk/inc/backend/controllers/actions.php

@@ -34 +34 @@
                     $action_class->do_action();
                     //getting action results
-                    $status = $action_class->getStatus();
+                    $status = $action_class->get_status();
                     //displaying error if set
                     if ($status['error']) {
@@ -41 +41 @@
                     //doing redirect if set
                     if ($status['do_redirect']) {
-                        $this->doRedirect($status['redirect_to']);
+                        $this->do_redirect($status['redirect_to']);
                     }
                 }

fastpixel-website-accelerator/trunk/inc/backend/controllers/cache.php

@@ -401 +401 @@
                 }
             }
-            echo wp_json_encode(['status' => 'error', 'statusText' => esc_html__('Post ID is wrong or empty', 'fastpixel-website-accelerator')]);
+            echo wp_json_encode(['status' => 'error', 'statusText' => esc_html__('Error occured while requesting cache', 'fastpixel-website-accelerator')]);
             wp_die();
         }

fastpixel-website-accelerator/trunk/inc/backend/models/diag-tests/ac-file.php

@@ -20 +20 @@
             if (file_exists(WP_CONTENT_DIR . DIRECTORY_SEPARATOR . 'advanced-cache.php')) {
                 $ac_content = file_get_contents(WP_CONTENT_DIR . DIRECTORY_SEPARATOR . 'advanced-cache.php');
-                if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content)) {
+                if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content) && preg_match('/FASTPIXEL_Config_Model/s', $ac_content)) {
                     $this->passed = true;
+                } else if (preg_match('/FASTPIXEL_ADVANCED_CACHE/s', $ac_content) && !preg_match('/FASTPIXEL_Config_Model/s', $ac_content)) {
+                    /* translators: %s should be an url */
+                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is outdated. %s it with the new FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') . '</a>', $generate_ac_file_url)), 'error');
                 } else {
                     /* translators: %s should be an url */
-                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is not a FastPixel drop-in. %s it with the FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') .'</a>', $generate_ac_file_url)), 'error');
+                    $this->add_notification_message(sprintf(esc_html__('The advanced-cache.php add-in file is not a FastPixel drop-in. %s it with the FastPixel drop-in.', 'fastpixel-website-accelerator'), sprintf('<a class="button" href="%s">' . esc_html__('Replace', 'fastpixel-website-accelerator') . '</a>', $generate_ac_file_url)), 'error');
                 }
             } else {

fastpixel-website-accelerator/trunk/inc/cache.php

@@ -47 +47 @@
             $this->functions = FASTPIXEL_Functions::get_instance();
             $this->config    = FASTPIXEL_Config_Model::get_instance();
-            //moving initialization to mu_plugin_loaded because we need sanitization and escaping function initialized
-            add_action('mu_plugin_loaded', [$this, 'init']);
-        }
-
-        public function init() {
+            
             //loading modules (need them in advanced-cache.php)
             $this->load_modules();
-
             //define FASTPIXEL_REST_URL for backend actions, using hook because during include rest_url throw error
             add_action('init', function () {
@@ -64 +59 @@
                 define('FASTPIXEL_API_URL', FASTPIXEL_API_HOST . '/api/v1/enqueue');
             }
-
             do_action('fastpixel_early_init');
 
+            //moving initialization to mu_plugin_loaded because we need sanitization and escaping function initialized
+            add_action('mu_plugin_loaded', [$this, 'init']);
+        }
+
+        public function init() {
             if (!$this->check_request_agent()) {
                 return;

fastpixel-website-accelerator/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.4
 Requires PHP: 5.6
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -148 +148 @@
 Release date: May 8, 2024
 * Fixes for complying with WP guidelines
+
+= 1.0.22 =
+Release date: May 8, 2024
+* Bugfix after wrong merge

fastpixel-website-accelerator/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '6bd5a70c8a80f8dbedc905f398098f0379310ed4',
+        'reference' => '258ef55266a10bc93a17b3be690199a63248223b',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '6bd5a70c8a80f8dbedc905f398098f0379310ed4',
+            'reference' => '258ef55266a10bc93a17b3be690199a63248223b',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',