From cdaa68f8db6b3613a40a513b654866992a5a7849 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Sun, 29 Sep 2024 19:24:52 -0700
Subject: [PATCH 1/2] bump version to 5.1.4

---
 CHANGELOG.md | 4 ++++
 marketplace  | 2 +-
 matomo.php   | 2 +-
 readme.txt   | 4 +++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad63f02c5..9c7085723 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 == Changelog ===
 
+= 5.1.4 =
+* Update Matomo core to version 5.1.2 (changes: https://matomo.org/changelog/matomo-5-1-2/)
+* Update some Matomo core dependencies.
+
 = 5.1.3 =
 * Update Matomo core to version 5.1.1 (changes: https://matomo.org/changelog/matomo-5-1-1/)
 * Moderate redesign to the feedback and get started admin pages.
diff --git a/marketplace b/marketplace
index c8ed1e38b..0b1b38153 160000
--- a/marketplace
+++ b/marketplace
@@ -1 +1 @@
-Subproject commit c8ed1e38bf10fb16254c80eb96af87ef325f0f0a
+Subproject commit 0b1b38153ee156829e80f84a6d4ab6ca391afecc
diff --git a/matomo.php b/matomo.php
index 41e005fab..cfec1f84b 100644
--- a/matomo.php
+++ b/matomo.php
@@ -4,7 +4,7 @@
  * Description: Privacy friendly, GDPR compliant and self-hosted. Matomo is the #1 Google Analytics alternative that gives you control of your data. Free and secure.
  * Author: Matomo
  * Author URI: https://matomo.org
- * Version: 5.1.3
+ * Version: 5.1.4
  * Domain Path: /languages
  * WC requires at least: 2.4.0
  * WC tested up to: 9.2.3
diff --git a/readme.txt b/readme.txt
index d96b4926d..4f054ed0e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: matomoteam
 Tags: matomo,analytics,statistics,stats,ecommerce
 Requires at least: 4.8
 Tested up to: 6.6.1
-Stable tag: 5.1.3
+Stable tag: 5.1.4
 Requires PHP: 7.2.5
 License: GPLv3 or later
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
@@ -14,6 +14,8 @@ Privacy friendly, GDPR compliant and self-hosted, Matomo is the #1 Google Analyt
 
 _Already a Matomo On-Premise or Matomo Cloud user? You need to use the [Connect Matomo plugin](https://wordpress.org/plugins/wp-piwik/) instead of this plugin._
 
+**New in version 5.1.4: fixes for a couple security issues. It is recommended to update to this version.**
+
 [youtube https://www.youtube.com/watch?v=puxi_Ey0iLc]
 
 For all you WordPress website owners wanting an easier way to get customer insights to grow your business, you can now get the solution the professionals use, for free!

From 32dc1a6fde18463cfd1467a478b57df277c969ed Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Sun, 29 Sep 2024 21:08:00 -0700
Subject: [PATCH 2/2] add code to wp-config.php in local dev environment to
 allow use of ngrok

---
 scripts/local-dev-entrypoint.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/scripts/local-dev-entrypoint.sh b/scripts/local-dev-entrypoint.sh
index 13fdebda1..6668b5546 100755
--- a/scripts/local-dev-entrypoint.sh
+++ b/scripts/local-dev-entrypoint.sh
@@ -152,6 +152,24 @@ define( 'WPMS_SMTP_PASS', '' );
 define( 'MATOMO_ANALYTICS_FILE', __DIR__ . '/wp-content/plugins/matomo/matomo.php' );
 define( 'MATOMO_LOCAL_ENVIRONMENT', 1 );
 
+if ( ! empty( \$_SERVER['HTTP_HOST'] )
+	&& preg_match( '/\.ngrok-free\.app$/', \$_SERVER['HTTP_HOST'] )
+) {
+	\$folder = basename( __DIR__ );
+	define('WP_HOME', 'https://' . \$_SERVER['HTTP_HOST'] . '/' . \$folder );
+	define('WP_SITEURL', 'https://' . \$_SERVER['HTTP_HOST'] . '/' . \$folder );
+} else {
+	\$folder = basename( __DIR__ );
+	define('WP_HOME', 'http://localhost/' . \$folder);
+	define('WP_SITEURL', 'http://localhost/' . \$folder);
+}
+
+if ( isset( \$_SERVER['HTTP_X_FORWARDED_PROTO'] )
+  && strpos( \$_SERVER['HTTP_X_FORWARDED_PROTO'], 'https' ) !== false
+) {
+	\$_SERVER['HTTPS'] = 'on';
+}
+
 \$table_prefix = 'wp_';
 
 /* That's all, stop editing! Happy publishing. */