From 12a271981a230f6e481158d9388b9d71a9f94068 Mon Sep 17 00:00:00 2001 From: Vladimir Bryzgalov Date: Tue, 12 May 2026 18:02:14 +0500 Subject: [PATCH] chore(wpmc S2): defensive defines + PostType::SLUG refs + stale comment Wrap 4 define() calls with defined() || guards to survive double-load. Replace hardcoded 'shortcode-town' strings in Taxonomy and FieldGroup with PostType::SLUG. Update Activator comment to reflect S2 reality. Co-Authored-By: Claude Sonnet 4.6 --- includes/class-activator.php | 3 ++- includes/class-field-group.php | 2 +- includes/class-taxonomy.php | 2 +- wp-multi-city.php | 8 ++++---- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/includes/class-activator.php b/includes/class-activator.php index dbf5ff3..9bd1d8b 100644 --- a/includes/class-activator.php +++ b/includes/class-activator.php @@ -7,7 +7,8 @@ final class Activator { public static function activate(): void { - // Stage 2 will register taxonomy + CPT; flush after they're declared. + // S2 registrations use rewrite=false; flush is harmless and + // forward-compatible with the S4 URL router. flush_rewrite_rules(); } diff --git a/includes/class-field-group.php b/includes/class-field-group.php index 7b36421..e6d05f0 100644 --- a/includes/class-field-group.php +++ b/includes/class-field-group.php @@ -55,7 +55,7 @@ final class FieldGroup ], 'location' => [ [ - ['param' => 'post_type', 'operator' => '==', 'value' => 'shortcode-town'], + ['param' => 'post_type', 'operator' => '==', 'value' => PostType::SLUG], ], ], 'menu_order' => 0, diff --git a/includes/class-taxonomy.php b/includes/class-taxonomy.php index c0c3772..634c90d 100644 --- a/includes/class-taxonomy.php +++ b/includes/class-taxonomy.php @@ -14,7 +14,7 @@ final class Taxonomy public static function do_register(): void { - register_taxonomy(self::SLUG, ['shortcode-town'], [ + register_taxonomy(self::SLUG, [PostType::SLUG], [ 'labels' => [ 'name' => __('Города', 'wp-multi-city'), 'singular_name' => __('Город', 'wp-multi-city'), diff --git a/wp-multi-city.php b/wp-multi-city.php index 21ad628..0ad761b 100644 --- a/wp-multi-city.php +++ b/wp-multi-city.php @@ -14,10 +14,10 @@ declare(strict_types=1); if (!defined('ABSPATH')) exit; -define('WPMC_PLUGIN_FILE', __FILE__); -define('WPMC_PLUGIN_DIR', plugin_dir_path(__FILE__)); -define('WPMC_PLUGIN_URL', plugin_dir_url(__FILE__)); -define('WPMC_VERSION', '0.1.0'); +defined('WPMC_PLUGIN_FILE') || define('WPMC_PLUGIN_FILE', __FILE__); +defined('WPMC_PLUGIN_DIR') || define('WPMC_PLUGIN_DIR', plugin_dir_path(__FILE__)); +defined('WPMC_PLUGIN_URL') || define('WPMC_PLUGIN_URL', plugin_dir_url(__FILE__)); +defined('WPMC_VERSION') || define('WPMC_VERSION', '0.1.0'); require_once WPMC_PLUGIN_DIR . 'includes/class-plugin.php'; \WPMultiCity\Plugin::register_autoloader();