From 456e38432d8ad5a35878a6cfd0a202d4e18b5d4e Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Thu, 12 Oct 2023 17:42:50 +0100
Subject: [PATCH] Upgrade wp-piwik to 10.0.30, and fix our patch
---
composer.json | 2 +-
composer.lock | 10 +--
patches/plugins/wp-piwik.patch | 114 ++++-----------------------------
3 files changed, 19 insertions(+), 107 deletions(-)
diff --git a/composer.json b/composer.json
index cac3f2d1..987ef28c 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
"wpackagist-plugin/more-privacy-options": "4.6",
"wpackagist-plugin/disable-emojis": "1.7.6",
"wpackagist-plugin/wp-super-cache": "1.10.0",
- "wpackagist-plugin/wp-piwik": "1.0.29",
+ "wpackagist-plugin/wp-piwik": "1.0.30",
"wpackagist-plugin/wp-syntax": "1.1",
"wpackagist-theme/azul": "1.51",
"wpackagist-theme/bliss": "1.2.0",
diff --git a/composer.lock b/composer.lock
index f5ad1290..e6b28f2a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "3b1b741e9c66639264f0dc27f86e805e",
+ "content-hash": "63cb2544448992057c94236c743ba5f4",
"packages": [
{
"name": "bjornjohansen/wplang",
@@ -1384,15 +1384,15 @@
},
{
"name": "wpackagist-plugin/wp-piwik",
- "version": "1.0.29",
+ "version": "1.0.30",
"source": {
"type": "svn",
"url": "https://plugins.svn.wordpress.org/wp-piwik/",
- "reference": "tags/1.0.29"
+ "reference": "tags/1.0.30"
},
"dist": {
"type": "zip",
- "url": "https://downloads.wordpress.org/plugin/wp-piwik.1.0.29.zip"
+ "url": "https://downloads.wordpress.org/plugin/wp-piwik.1.0.30.zip"
},
"require": {
"composer/installers": "^1.0 || ^2.0"
@@ -2005,5 +2005,5 @@
"php": ">=7.1"
},
"platform-dev": [],
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/patches/plugins/wp-piwik.patch b/patches/plugins/wp-piwik.patch
index 7a71dca8..ba14c1eb 100644
--- a/patches/plugins/wp-piwik.patch
+++ b/patches/plugins/wp-piwik.patch
@@ -1,104 +1,16 @@
-From 587106fbca67c903516a3eb814ec04120692a8ad Mon Sep 17 00:00:00 2001
-From: ale <ale@incal.net>
-Date: Fri, 31 Jul 2015 12:11:22 +0000
-Subject: [PATCH 182/229] disable wp-piwik global update script
-
----
- .../plugins/wp-piwik/update/2015051101.php | 86 ++++++++++---------
- 1 file changed, 45 insertions(+), 41 deletions(-)
-
-diff --git a/wp-content/plugins/wp-piwik/update/2015051101.php b/wp-content/plugins/wp-piwik/update/2015051101.php
-index 6b11411a..bc9a4308 100755
---- a/wp-content/plugins/wp-piwik/update/2015051101.php
-+++ b/wp-content/plugins/wp-piwik/update/2015051101.php
-@@ -1,41 +1,45 @@
--<?php
--
--// Get & delete old version's options
--if (self::$settings->checkNetworkActivation ()) {
-- $oldGlobalOptions = get_site_option ( 'wp-piwik_global-settings', array () );
-- delete_site_option('wp-piwik_global-settings');
--} else {
-- $oldGlobalOptions = get_option ( 'wp-piwik_global-settings', array () );
-- delete_option('wp-piwik_global-settings');
--}
--
--$oldOptions = get_option ( 'wp-piwik_settings', array () );
--delete_option('wp-piwik_settings');
--
--if (self::$settings->checkNetworkActivation ()) {
-- global $wpdb;
-- $aryBlogs = \WP_Piwik\Settings::getBlogList();
-- if (is_array($aryBlogs))
-- foreach ($aryBlogs as $aryBlog) {
-- $oldOptions = get_blog_option ( $aryBlog['blog_id'], 'wp-piwik_settings', array () );
-- if (!$this->isConfigured())
-- foreach ( $oldOptions as $key => $value )
-- self::$settings->setOption ( $key, $value, $aryBlog['blog_id'] );
-- delete_blog_option($aryBlog['blog_id'], 'wp-piwik_settings');
-- }
--}
--
--if (!$this->isConfigured()) {
-- if (!$oldGlobalOptions['add_tracking_code']) $oldGlobalOptions['track_mode'] = 'disabled';
-- elseif (!$oldGlobalOptions['track_mode']) $oldGlobalOptions['track_mode'] = 'default';
-- elseif ($oldGlobalOptions['track_mode'] == 1) $oldGlobalOptions['track_mode'] = 'js';
-- elseif ($oldGlobalOptions['track_mode'] == 2) $oldGlobalOptions['track_mode'] = 'proxy';
--
-- // Store old values in new settings
-- foreach ( $oldGlobalOptions as $key => $value )
-- self::$settings->setGlobalOption ( $key, $value );
-- foreach ( $oldOptions as $key => $value )
-- self::$settings->setOption ( $key, $value );
--}
--
+--- a/wp-content/plugins/wp-piwik/update/2015051101.php 2023-10-12 17:33:30.292499418 +0100
++++ b/wp-content/plugins/wp-piwik/update/2015051101.php 2023-10-12 17:34:07.615148387 +0100
+@@ -1,4 +1,5 @@
+ <?php
++/**
+
+ // Get & delete old version's options
+ if (self::$settings->checkNetworkActivation ()) {
+@@ -38,4 +39,5 @@
+ self::$settings->setOption ( $key, $value );
+ }
+
-self::$settings->save ();
\ No newline at end of file
-+<?php
-+
-+/**** a/i patch: DISABLE THIS GLOBAL UPDATE
-+
-+// Get & delete old version's options
-+if (self::$settings->checkNetworkActivation ()) {
-+ $oldGlobalOptions = get_site_option ( 'wp-piwik_global-settings', array () );
-+ delete_site_option('wp-piwik_global-settings');
-+} else {
-+ $oldGlobalOptions = get_option ( 'wp-piwik_global-settings', array () );
-+ delete_option('wp-piwik_global-settings');
-+}
-+
-+$oldOptions = get_option ( 'wp-piwik_settings', array () );
-+delete_option('wp-piwik_settings');
-+
-+if (self::$settings->checkNetworkActivation ()) {
-+ global $wpdb;
-+ $aryBlogs = \WP_Piwik\Settings::getBlogList();
-+ if (is_array($aryBlogs))
-+ foreach ($aryBlogs as $aryBlog) {
-+ $oldOptions = get_blog_option ( $aryBlog['blog_id'], 'wp-piwik_settings', array () );
-+ if (!$this->isConfigured())
-+ foreach ( $oldOptions as $key => $value )
-+ self::$settings->setOption ( $key, $value, $aryBlog['blog_id'] );
-+ delete_blog_option($aryBlog['blog_id'], 'wp-piwik_settings');
-+ }
-+}
-+
-+if (!$this->isConfigured()) {
-+ if (!$oldGlobalOptions['add_tracking_code']) $oldGlobalOptions['track_mode'] = 'disabled';
-+ elseif (!$oldGlobalOptions['track_mode']) $oldGlobalOptions['track_mode'] = 'default';
-+ elseif ($oldGlobalOptions['track_mode'] == 1) $oldGlobalOptions['track_mode'] = 'js';
-+ elseif ($oldGlobalOptions['track_mode'] == 2) $oldGlobalOptions['track_mode'] = 'proxy';
-+
-+ // Store old values in new settings
-+ foreach ( $oldGlobalOptions as $key => $value )
-+ self::$settings->setGlobalOption ( $key, $value );
-+ foreach ( $oldOptions as $key => $value )
-+ self::$settings->setOption ( $key, $value );
-+}
-+
+self::$settings->save ();
-+
-+****/
---
-2.17.1
-
++**/
--
GitLab