Changeset 3455323

Timestamp:

02/06/2026 11:47:26 AM (2 weeks ago)

Author:

plausible

Message:

Update to version 2.5.3 from GitHub

Location:

plausible-analytics

Files:

• tags/2.5.3 (copied) (copied from plausible-analytics/trunk)
• tags/2.5.3/languages/plausible-analytics.pot (modified) (3 diffs)
• tags/2.5.3/plausible-analytics.php (modified) (1 diff)
• tags/2.5.3/readme.txt (modified) (2 diffs)
• tags/2.5.3/src/Admin/Upgrades.php (modified) (2 diffs)
• tags/2.5.3/src/Client.php (modified) (1 diff)
• trunk/languages/plausible-analytics.pot (modified) (3 diffs)
• trunk/plausible-analytics.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/src/Admin/Upgrades.php (modified) (2 diffs)
• trunk/src/Client.php (modified) (1 diff)

plausible-analytics/tags/2.5.3/languages/plausible-analytics.pot

@@ -8 +8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Plausible Analytics Team <[email protected]>\n"
-"POT-Creation-Date: 2026-02-05 18:00+0000\n"
+"POT-Creation-Date: 2026-02-06 11:46+0000\n"
 "Report-Msgid-Bugs-To: https://github.com/plausible/wordpress/issues/new\n"
 "X-Poedit-Basepath: ..\n"
@@ -57 +57 @@
 msgstr ""
 
-#: src/Client.php:227
+#: src/Client.php:232
 msgid "Something went wrong while updating tracker script configuration: %s"
 msgstr ""
 
-#: src/Client.php:252
+#: src/Client.php:257
 msgid "Something went wrong, try again later."
 msgstr ""
 
-#: src/Client.php:298
+#: src/Client.php:303
 msgid "Something went wrong while creating Shared Link: %s"
 msgstr ""
 
-#: src/Client.php:336
+#: src/Client.php:341
 msgid "Something went wrong while creating Custom Event Goal: %s"
 msgstr ""
 
-#: src/Client.php:353
+#: src/Client.php:358
 msgid "Something went wrong while creating Funnel: %s"
 msgstr ""
 
-#: src/Client.php:370
+#: src/Client.php:375
 msgid "Something went wrong while deleting a Custom Event Goal: %s"
 msgstr ""
 
-#: src/Client.php:393
+#: src/Client.php:398
 msgid "Something went wrong while enabling Pageview Properties: %s"
 msgstr ""
@@ -142 +142 @@
 msgstr ""
 
+#: src/Admin/Upgrades.php:383
+msgid "An API token for Plausible Analytics is required. Please create one from the <a href=\"%s\">Settings screen</a> and upgrade Plausible CE if necessary."
+msgstr ""
+
 #: src/Integrations/EDD.php:37, src/Integrations/WooCommerce.php:40
 msgid "Visit %s*"

plausible-analytics/tags/2.5.3/plausible-analytics.php

@@ -6 +6 @@
  * Author: Plausible.io
  * Author URI: https://plausible.io
- * Version: 2.5.2
+ * Version: 2.5.3
  * Text Domain: plausible-analytics
  * Domain Path: /languages

plausible-analytics/tags/2.5.3/readme.txt

@@ -6 +6 @@
 Tested up to: 6.9
 Requires PHP: 7.2
-Stable tag: 2.5.2
+Stable tag: 2.5.3
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT
@@ -157 +157 @@
 == Changelog ==
 
+= 2.5.3 =
+* Fixed: display a notice to CE users that haven't entered an API token yet.
+* Fixed: a critical error would occur if the entered API token was invalid.
+
 = 2.5.2 =
 * Fixed: CE users still using a self-hosted version without Plugins API support would get a critical error after updating to 2.5.1.

plausible-analytics/tags/2.5.3/src/Admin/Upgrades.php

@@ -95 +95 @@
         }
 
+        if ( version_compare( $plausible_analytics_version, '2.5.3', '<' ) ) {
+            $this->upgrade_to_253();
+        }
+
         // Add required upgrade routines for future versions here.
     }
@@ -347 +351 @@
         update_option( 'plausible_analytics_version', '2.5.1' );
     }
+
+    /**
+     * Show an admin-wide notice to CE users that haven't entered an API token yet.
+     *
+     * @return void
+     */
+    public function upgrade_to_253() {
+        $self_hosted_domain = Helpers::get_settings()['self_hosted_domain'];
+        $api_token          = Helpers::get_settings()['api_token'];
+
+        // Not a CE user or a CE user already using the Plugins API.
+        if ( empty( $self_hosted_domain ) || ! empty( $api_token ) ) {
+            update_option( 'plausible_analytics_version', '2.5.3' );
+
+            return;
+        }
+
+        add_action( 'admin_notices', [ $this, 'show_api_token_notice' ] );
+    }
+
+    /**
+     * Display a notice to CE users that haven't entered an API token yet.
+     *
+     * @return void
+     */
+    public function show_api_token_notice() {
+        $url = admin_url( 'options-general.php?page=plausible_analytics' );
+
+        ?>
+        <div class="notice notice-warning">
+            <p><?php echo sprintf( __( 'An API token for Plausible Analytics is required. Please create one from the <a href="%s">Settings screen</a> and upgrade Plausible CE if necessary.',
+                        'plausible-analytics' )
+                    , $url ); ?></p>
+        </div>
+        <?php
+    }
 }

plausible-analytics/tags/2.5.3/src/Client.php

@@ -185 +185 @@
         if ( ! $id ) {
             $tracker_configuration = $this->get_configuration();
-            $id                    = $tracker_configuration->getId();
+
+            if ( ! $tracker_configuration instanceof Client\Model\TrackerScriptConfigurationTrackerScriptConfiguration ) {
+                return '';
+            }
+
+            $id = $tracker_configuration->getId();
 
             update_option( 'plausible_analytics_tracker_id', $id );

plausible-analytics/trunk/languages/plausible-analytics.pot

@@ -8 +8 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: Plausible Analytics Team <[email protected]>\n"
-"POT-Creation-Date: 2026-02-05 18:00+0000\n"
+"POT-Creation-Date: 2026-02-06 11:46+0000\n"
 "Report-Msgid-Bugs-To: https://github.com/plausible/wordpress/issues/new\n"
 "X-Poedit-Basepath: ..\n"
@@ -57 +57 @@
 msgstr ""
 
-#: src/Client.php:227
+#: src/Client.php:232
 msgid "Something went wrong while updating tracker script configuration: %s"
 msgstr ""
 
-#: src/Client.php:252
+#: src/Client.php:257
 msgid "Something went wrong, try again later."
 msgstr ""
 
-#: src/Client.php:298
+#: src/Client.php:303
 msgid "Something went wrong while creating Shared Link: %s"
 msgstr ""
 
-#: src/Client.php:336
+#: src/Client.php:341
 msgid "Something went wrong while creating Custom Event Goal: %s"
 msgstr ""
 
-#: src/Client.php:353
+#: src/Client.php:358
 msgid "Something went wrong while creating Funnel: %s"
 msgstr ""
 
-#: src/Client.php:370
+#: src/Client.php:375
 msgid "Something went wrong while deleting a Custom Event Goal: %s"
 msgstr ""
 
-#: src/Client.php:393
+#: src/Client.php:398
 msgid "Something went wrong while enabling Pageview Properties: %s"
 msgstr ""
@@ -142 +142 @@
 msgstr ""
 
+#: src/Admin/Upgrades.php:383
+msgid "An API token for Plausible Analytics is required. Please create one from the <a href=\"%s\">Settings screen</a> and upgrade Plausible CE if necessary."
+msgstr ""
+
 #: src/Integrations/EDD.php:37, src/Integrations/WooCommerce.php:40
 msgid "Visit %s*"

plausible-analytics/trunk/plausible-analytics.php

@@ -6 +6 @@
  * Author: Plausible.io
  * Author URI: https://plausible.io
- * Version: 2.5.2
+ * Version: 2.5.3
  * Text Domain: plausible-analytics
  * Domain Path: /languages

plausible-analytics/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.9
 Requires PHP: 7.2
-Stable tag: 2.5.2
+Stable tag: 2.5.3
 License: Massachusetts Institute of Technology (MIT) license
 License URI: https://opensource.org/licenses/MIT
@@ -157 +157 @@
 == Changelog ==
 
+= 2.5.3 =
+* Fixed: display a notice to CE users that haven't entered an API token yet.
+* Fixed: a critical error would occur if the entered API token was invalid.
+
 = 2.5.2 =
 * Fixed: CE users still using a self-hosted version without Plugins API support would get a critical error after updating to 2.5.1.

plausible-analytics/trunk/src/Admin/Upgrades.php

@@ -95 +95 @@
         }
 
+        if ( version_compare( $plausible_analytics_version, '2.5.3', '<' ) ) {
+            $this->upgrade_to_253();
+        }
+
         // Add required upgrade routines for future versions here.
     }
@@ -347 +351 @@
         update_option( 'plausible_analytics_version', '2.5.1' );
     }
+
+    /**
+     * Show an admin-wide notice to CE users that haven't entered an API token yet.
+     *
+     * @return void
+     */
+    public function upgrade_to_253() {
+        $self_hosted_domain = Helpers::get_settings()['self_hosted_domain'];
+        $api_token          = Helpers::get_settings()['api_token'];
+
+        // Not a CE user or a CE user already using the Plugins API.
+        if ( empty( $self_hosted_domain ) || ! empty( $api_token ) ) {
+            update_option( 'plausible_analytics_version', '2.5.3' );
+
+            return;
+        }
+
+        add_action( 'admin_notices', [ $this, 'show_api_token_notice' ] );
+    }
+
+    /**
+     * Display a notice to CE users that haven't entered an API token yet.
+     *
+     * @return void
+     */
+    public function show_api_token_notice() {
+        $url = admin_url( 'options-general.php?page=plausible_analytics' );
+
+        ?>
+        <div class="notice notice-warning">
+            <p><?php echo sprintf( __( 'An API token for Plausible Analytics is required. Please create one from the <a href="%s">Settings screen</a> and upgrade Plausible CE if necessary.',
+                        'plausible-analytics' )
+                    , $url ); ?></p>
+        </div>
+        <?php
+    }
 }

plausible-analytics/trunk/src/Client.php

@@ -185 +185 @@
         if ( ! $id ) {
             $tracker_configuration = $this->get_configuration();
-            $id                    = $tracker_configuration->getId();
+
+            if ( ! $tracker_configuration instanceof Client\Model\TrackerScriptConfigurationTrackerScriptConfiguration ) {
+                return '';
+            }
+
+            $id = $tracker_configuration->getId();
 
             update_option( 'plausible_analytics_tracker_id', $id );