Merge upstream changes from version 4.1.1

chesio · Dec 17, 2020 · 65b41a8 · 65b41a8
1 parent e78f109
commit 65b41a8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/readme.txt b/readme.txt
@@ -1,9 +1,9 @@
 === Google XML Sitemaps ===
-Contributors: arnee
+Contributors: auctollo
 Tags: seo, google, bing, yahoo, msn, ask, live, sitemaps, google sitemaps, xml sitemap, xml
 Requires at least: 3.3
-Tested up to: 5.0.1
-Stable tag: 4.1.0.pl
+Tested up to: 5.5
+Stable tag: 4.1.1.pl
 License: GPLv2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -77,6 +77,9 @@ The WordPress.org repository is just another place to download this plugin. I do
 
 == Changelog ==
 
+= 4.1.1 (2020-08-11) =
+* Fixed security issue related to trailing slashes
+
 = 4.1.0 (2018-12-18) =
 * Fixed security issue related to escaping external URLs
 * Fixed security issue related to option tags in forms

diff --git a/sitemap-loader.php b/sitemap-loader.php
@@ -59,6 +59,9 @@ public static function Enable() {
 		if (!wp_get_schedule('sm_ping_daily')) {
 			wp_schedule_event(time() + (60 * 60), 'daily', 'sm_ping_daily');
 		}
+
+		//Disable the WP core XML sitemaps.
+		add_filter( 'wp_sitemaps_enabled', '__return_false' );
 	}
 
 	/**

diff --git a/sitemap-ui.php b/sitemap-ui.php
@@ -305,10 +305,10 @@ public function HtmlShowOptionsPage() {
 							$_POST[$k]=stripslashes(self::escape($_POST[$k]));
 						} else if($k=="sm_b_baseurl") {
 							$_POST[$k] = esc_url_raw(trim(self::escape($_POST[$k])));
-							if(!empty($_POST[$k])) $_POST[$k] = trailingslashit($_POST[$k]);
+							if(!empty($_POST[$k])) $_POST[$k] = untrailingslashit($_POST[$k]);
 						} else if($k=="sm_b_style") {
 							$_POST[$k] = esc_url_raw(trim(self::escape($_POST[$k])));
-							if(!empty($_POST[$k])) $_POST[$k] = trailingslashit($_POST[$k]);
+							if(!empty($_POST[$k])) $_POST[$k] = untrailingslashit($_POST[$k]);
 						}
 						$this->sg->SetOption($k,(string) $_POST[$k]);
 					} else if($k == "sm_b_time") {

diff --git a/sitemap.php b/sitemap.php
@@ -10,23 +10,21 @@
 
  For additional details like installation instructions, please check the readme.txt and documentation.txt files.
 
- Have fun!
-   Arne
 
  Info for WordPress:
  ==============================================================================
  Plugin Name: Google XML Sitemaps
  Plugin URI: http://www.arnebrachhold.de/redir/sitemap-home/
  Description: This plugin improves SEO using sitemaps for best indexation by search engines like Google, Bing, Yahoo and others.
- Version: 4.1.0.pl-2020-01-29
- Author: Arne Brachhold
+ Version: 4.1.1.pl-2020-12-17
+ Author: Auctollo
  Author URI: http://www.arnebrachhold.de/
  Text Domain: sitemap
  Domain Path: /lang
  GitHub Plugin URI: https://github.com/chesio/google-sitemap-generator
 
 
- Copyright 2005 - 2018 ARNE BRACHHOLD  (email : himself - arnebrachhold - de)
+ Copyright 2005 - 2018 AUCTOLLO
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by