← All changes | simple-tags.php +44 -20 3.54.0 → 4.0.0 View file →

		@@ -1,26 +1,26 @@
1	1	<?php
2	2
3	3	/**
4		- * Plugin Name: TaxoPress
	4	+ * Plugin Name: PublishPress Taxonomies Free
5	5	* Plugin URI: https://wordpress.org/plugins/simple-tags/
6		- * Description: TaxoPress allows you to create and manage Tags, Categories, and all your WordPress taxonomy terms.
7		- * Version: 3.54.0
8		- * Author: TaxoPress
9		- * Author URI: https://taxopress.com
	6	+ * Description: PublishPress Taxonomies allows you to create and manage Tags, Categories, and all your WordPress taxonomy terms.
	7	+ * Version: 4.0.0
	8	+ * Author: PublishPress
	9	+ * Author URI: https://publishpress.com
10	10	* Text Domain: simple-tags
11	11	* Domain Path: /languages
12		- * Min WP Version: 4.9.7
	12	+ * Requires at least: 6.7
13	13	* Requires PHP: 7.4
14	14	* License: GPLv3
15	15	*
16		- * Copyright (c) 2022 Taxopress
	16	+ * Copyright (c) 2022 PublishPress
17	17	*
18	18	* @package simple-tags
19		- * @author TaxoPress
20		- * @copyright Copyright (c) 2022 Taxopress
	19	+ * @author PublishPress
	20	+ * @copyright Copyright (c) 2022 PublishPress
21	21	* @license GNU General Public License version 2
22		- * @link https://TaxoPress.com/
	22	+ * @link https://publishpress.com/
23	23	*/
24	24
25	25	######################################
26	26	/*
		@@ -33,14 +33,14 @@
33	33	but WITHOUT ANY WARRANTY; without even the implied warranty of
34	34	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
35	35	GNU General Public License for more details.
36	36
37		-Contributors to the TaxoPress code include:
	37	+Contributors to the PublishPress Taxonomies code include:
38	38	- Kevin Drouvin ([email protected] - http://inside-dev.net)
39	39	- Martin Modler ([email protected] - http://www.webformatik.com)
40	40	- Vladimir Kolesnikov ([email protected] - http://blog.sjinks.pro)
41	41
42		-Sections of the TaxoPress code are based on Custom Post Type UI by WebDevStudios.
	42	+Sections of the PublishPress Taxonomies code are based on Custom Post Type UI by WebDevStudios.
43	43
44	44	Credits Icons :
45	45	- famfamfam - http://www.famfamfam.com/lab/icons/silk/
46	46
		@@ -51,15 +51,30 @@
51	51	die('-1');
52	52	}
53	53
54	54	if (!defined('STAGS_VERSION')) {
55		- define('STAGS_VERSION', '3.54.0');
	55	+ define('STAGS_VERSION', '4.0.0');
56	56	}
57	57
	58	+if (! defined('PUBLISHPRESS_TAXONOMIES_VERSION')) {
	59	+ define('PUBLISHPRESS_TAXONOMIES_VERSION', STAGS_VERSION);
	60	+}
	61	+
	62	+// Preserve the legacy TaxoPress version alias for existing integrations.
	63	+if (! defined('TAXOPRESS_VERSION')) {
	64	+ define('TAXOPRESS_VERSION', PUBLISHPRESS_TAXONOMIES_VERSION);
	65	+}
	66	+
58	67	if (! function_exists('taxopress_free_is_pro_active')) {
59	68	function taxopress_free_is_pro_active()
60	69	{
61		- if (defined('TAXOPRESS_PRO_FILE') || defined('TAXOPRESS_PRO_VERSION')) {
	70	+ // Recognize PublishPress Taxonomies Pro and legacy TaxoPress Pro identifiers.
	71	+ if (
	72	+ defined('PUBLISHPRESS_TAXONOMIES_PRO_FILE')
	73	+ || defined('PUBLISHPRESS_TAXONOMIES_PRO_VERSION')
	74	+ || defined('TAXOPRESS_PRO_FILE')
	75	+ || defined('TAXOPRESS_PRO_VERSION')
	76	+ ) {
62	77	return true;
63	78	}
64	79
65	80	if (! function_exists('get_option')) {
		@@ -68,9 +83,14 @@
68	83
69	84	$pro_active = false;
70	85
71	86	foreach ((array) get_option('active_plugins') as $plugin_file) {
72		- if (false !== strpos($plugin_file, 'taxopress-pro/taxopress-pro.php')) {
	87	+ // Support the legacy entry point and both renamed-plugin transition paths.
	88	+ if (
	89	+ false !== strpos($plugin_file, 'taxopress-pro/taxopress-pro.php')
	90	+ || false !== strpos($plugin_file, 'publishpress-taxonomies-pro/taxopress-pro.php')
	91	+ || false !== strpos($plugin_file, 'publishpress-taxonomies-pro/publishpress-taxonomies-pro.php')
	92	+ ) {
73	93	$pro_active = true;
74	94	break;
75	95	}
76	96	}
		@@ -76,9 +96,13 @@
76	96	}
77	97
78	98	if (! $pro_active && function_exists('is_multisite') && is_multisite()) {
79	99	foreach (array_keys((array) get_site_option('active_sitewide_plugins')) as $plugin_file) {
80		- if (false !== strpos($plugin_file, 'taxopress-pro/taxopress-pro.php')) {
	100	+ if (
	101	+ false !== strpos($plugin_file, 'taxopress-pro/taxopress-pro.php')
	102	+ || false !== strpos($plugin_file, 'publishpress-taxonomies-pro/taxopress-pro.php')
	103	+ || false !== strpos($plugin_file, 'publishpress-taxonomies-pro/publishpress-taxonomies-pro.php')
	104	+ ) {
81	105	$pro_active = true;
82	106	break;
83	107	}
84	108	}
		@@ -121,9 +145,9 @@
121	145
122	146	delete_transient('taxopress_free_deactivated_due_to_pro');
123	147
124	148	echo '<div class="notice notice-warning is-dismissible"><p>'
125		- . esc_html__('TaxoPress was not activated because TaxoPress Pro is already active. Please keep only TaxoPress Pro enabled.', 'simple-tags')
	149	+ . esc_html__('PublishPress Taxonomies was not activated because PublishPress Taxonomies Pro is already active. Please keep only PublishPress Taxonomies Pro enabled.', 'simple-tags')
126	150	. '</p></div>';
127	151	});
128	152	}
129	153
		@@ -140,9 +164,9 @@
140	164
141	165	if (class_exists('PublishPressInstanceProtection\\Config')) {
142	166	$pluginCheckerConfig = new PublishPressInstanceProtection\Config();
143	167	$pluginCheckerConfig->pluginSlug = 'simple-tags';
144		- $pluginCheckerConfig->pluginName = 'TaxoPress';
	168	+ $pluginCheckerConfig->pluginName = 'PublishPress Taxonomies';
145	169
146	170	$pluginChecker = new PublishPressInstanceProtection\InstanceChecker($pluginCheckerConfig);
147	171	}
148	172
		@@ -226,12 +250,12 @@
226	250	}
227	251
228	252	require STAGS_DIR . '/inc/loads.php';
229	253
230		-// Init TaxoPress
	254	+// Init PublishPress Taxonomies
231	255	function init_free_simple_tags()
232	256	{
233		- if (is_admin() && !defined('TAXOPRESS_PRO_VERSION')) {
	257	+ if (is_admin() && ! defined('PUBLISHPRESS_TAXONOMIES_PRO_VERSION') && ! defined('TAXOPRESS_PRO_VERSION')) {
234	258	require_once(TAXOPRESS_ABSPATH . '/includes-core/TaxopressCoreAdmin.php');
235	259	new \PublishPress\Taxopress\TaxopressCoreAdmin();
236	260	}
237	261	}