Merge pull request #110 from itthinx/tested-4.12.0-6.0

Tested 4.12.0 6.0

COPYRIGHT.txt

@@ -1,37 +1,37 @@
 
  The Affiliates WordPress Plugin
- 
- Copyright 2010 - 2021 "kento" (Karim Rahimpur) www.itthinx.com
- 
+
+ Copyright 2010 - 2022 "kento" (Karim Rahimpur) www.itthinx.com
+
  The files COPYRIGHT.txt and LICENSE.txt as well as ALL NOTICES IN THE
  HEADERS OF ALL FILES MUST BE KEPT INTACT.
 
  GPL-licensed
- 
+
  Unless otherwise stated, all code in this plugin is licensed under
  the GPL License:
- 
+
  All code is part of this plugin,  hereinafter referred to as "program".
- 
+
  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
  the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
- 
+
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- 
+
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- 
+
+
  Visit http://www.itthinx.com/ for help, general info and fun.
- 
+
  Plugin page: http://www.itthinx.com/plugins/affiliates
- 
+
  Official and trusted premium versions are available here only:
- 
+
  Affiliates Pro : http://www.itthinx.com/shop/affiliates-pro
  Affiliates Enterprise : http://www.itthinx.com/shop/affiliates-enterprise

affiliates.php

@@ -2,7 +2,7 @@
 /**
  * affiliates.php
  *
- * Copyright (c) 2010-2021 "kento" Karim Rahimpur www.itthinx.com
+ * Copyright (c) 2010-2022 "kento" Karim Rahimpur www.itthinx.com
  *
  * This code is released under the GNU General Public License.
  * See COPYRIGHT.txt and LICENSE.txt.
@@ -21,7 +21,7 @@
  * Plugin Name: Affiliates
  * Plugin URI: http://www.itthinx.com/plugins/affiliates
  * Description: The Affiliates plugin provides the right tools to maintain a partner referral program.
- * Version: 4.11.0
+ * Version: 4.12.0
  * Author: itthinx
  * Author URI: http://www.itthinx.com
  * Donate-Link: http://www.itthinx.com
@@ -35,7 +35,7 @@
 }
 
 if ( !defined( 'AFFILIATES_CORE_VERSION' ) ) {
-	define( 'AFFILIATES_CORE_VERSION', '4.11.0' );
+	define( 'AFFILIATES_CORE_VERSION', '4.12.0' );
 	define( 'AFFILIATES_PLUGIN_NAME', 'affiliates' );
 	define( 'AFFILIATES_FILE', __FILE__ );
 	define( 'AFFILIATES_PLUGIN_BASENAME', plugin_basename( AFFILIATES_FILE ) );

changelog.txt

@@ -1,5 +1,11 @@
 == Affiliates - Changelog ==
 
+= 4.12.0 =
+* WordPress 6.0 compatible.
+* Requires at least WordPress 5.6.
+* Fixed a PHP Notice with WordPress 6 and updated our add_menu_page to use an integer for the plugin's menu position.
+* Removed uses of the deprecated wp_cache_reset() function.
+
 = 4.11.0 =
 * WordPress 5.9 compatible.
 * Requires at least WordPress 5.5.

lib/core/wp-init.php

@@ -225,7 +225,6 @@ function affiliates_activate( $network_wide = false ) {
 		$blog_ids = affiliates_get_blogs();
 		foreach ( $blog_ids as $blog_id ) {
 			switch_to_blog( $blog_id );
-			wp_cache_reset();
 			affiliates_setup();
 			restore_current_blog();
 		}
@@ -242,7 +241,6 @@ function affiliates_wpmu_new_blog( $blog_id, $user_id ) {
 	if ( is_multisite() ) {
 		if ( affiliates_is_sitewide_plugin() ) {
 			switch_to_blog( $blog_id );
-			wp_cache_reset();
 			affiliates_setup();
 			restore_current_blog();
 		}
@@ -259,7 +257,6 @@ function affiliates_delete_blog( $blog_id, $drop = false ) {
 	if ( is_multisite() ) {
 		if ( affiliates_is_sitewide_plugin() ) {
 			switch_to_blog( $blog_id );
-			wp_cache_reset();
 			affiliates_cleanup( $drop );
 			restore_current_blog();
 		}
@@ -771,7 +768,6 @@ function affiliates_deactivate( $network_wide = false ) {
 			$blog_ids = affiliates_get_blogs();
 			foreach ( $blog_ids as $blog_id ) {
 				switch_to_blog( $blog_id );
-				wp_cache_reset();
 				affiliates_cleanup( true );
 				restore_current_blog();
 			}
@@ -1780,7 +1776,7 @@ function affiliates_admin_menu() {
 		'affiliates-admin',
 		'affiliates_admin',
 		AFFILIATES_PLUGIN_URL . '/images/affiliates.png',
-		'58.187'
+		58
 	);
 	$pages[] = $page;
 	add_action( 'admin_print_styles-' . $page, 'affiliates_admin_print_styles' );

readme.txt

@@ -2,10 +2,10 @@
 Contributors: itthinx, proaktion
 Donate link: https://www.itthinx.com/shop/
 Tags: affiliate, affiliates, affiliate marketing, referral, growth marketing, ads, AddToAny, AddThis, advertising, affiliate plugin, affiliate tool, contact form, contact form 7, downloads, e-commerce, Ecwid, Events Manager, Jigoshop, lead, link, marketing, money, partner, Pay per Click, PayPal, PPC, referral links, referrer, sales, shopping cart, track, transaction, WooCommerce
-Requires at least: 5.5.0
-Tested up to: 5.9
+Requires at least: 5.6.0
+Tested up to: 6.0
 Requires PHP: 5.6.0
-Stable tag: 4.11.0
+Stable tag: 4.12.0
 License: GPLv3
 
 The Affiliates system provides the most powerful growth-oriented tools to run a successful Affiliate Marketing Program.
@@ -183,7 +183,7 @@ Ukranian by Michael Yunat from [GetVoIP](http://getvoip.com)
 
 More detailed instructions are available on the [Documentation](http://docs.itthinx.com/document/affiliates/) pages.
 
-1. Upload or extract the `affiliates` folder to your site's `/wp-content/plugins/` directory. Or you could use the *Add new* option found in the *Plugins* menu in WordPress.  
+1. Upload or extract the `affiliates` folder to your site's `/wp-content/plugins/` directory. Or you could use the *Add new* option found in the *Plugins* menu in WordPress.
 2. Enable the plugin from the *Plugins* menu in WordPress.
 3. A new *Affiliates* menu will appear in WordPress, this is where you manage your affiliates and keep track of visits and referrals.
 4. Go to _Affiliates > Settings > Pages_ and click the *Generate* button. This will add a new page to your site with a default Affiliate Area that you can then edit if needed.