Changeset 3731157

Timestamp:

10/06/2026 03:42:54 PM (3 weeks ago)

Author:

carlosbanyuls

Message:

Release 1.0.25: fix category pillar same-slug URLs

Location:

honoko-core/trunk

Files:

• README.md (modified) (2 diffs)
• honoko-core.php (modified) (2 diffs)
• inc/clusters.php (modified) (2 diffs)
• readme.txt (modified) (7 diffs)

honoko-core/trunk/README.md

@@ -1 @@
-# HONOKO Core 1.0.24
+# HONOKO Core 1.0.25
 
 Persistent visual Builder, pillar pages, content clusters and SEO tools for HONOKO.
-
-HONOKO Core can be used with third-party WordPress themes. HONOKO Theme remains the optional presentation layer designed for the complete HONOKO experience.
 
 This package is the WordPress.org-ready free Core component. It uses the `honoko_` public namespace and contains no premium implementation code.
@@ -9 +7 @@
 ## Resources
 
-Official website and HONOKO Theme: https://honokotheme.com/  
 HONOKO Builder icon artwork, Copyright 2026 Carlos Banyuls.  
-License: GPL-2.0-or-later.
+License: GPL-2.0-or-later.  
+Source: https://honokotheme.com/

honoko-core/trunk/honoko-core.php

@@ -4 +4 @@
  * Plugin URI: https://honokotheme.com/
  * Description: Persistent visual Builder, pillar pages, content clusters and SEO tools for HONOKO.
- * Version: 1.0.24
+ * Version: 1.0.25
  * Requires at least: 6.4
  * Requires PHP: 7.4
@@ -14 +14 @@
  */
 if ( ! defined( 'ABSPATH' ) ) exit;
-define( 'HONOKO_CORE_VERSION', '1.0.24' );
+define( 'HONOKO_CORE_VERSION', '1.0.25' );
 define( 'HONOKO_CORE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HONOKO_CORE_URI', plugin_dir_url( __FILE__ ) );

honoko-core/trunk/inc/clusters.php

@@ -37 +37 @@
     return ( $term && ! is_wp_error( $term ) ) ? $term : null;
 }
+
+
+/**
+ * HONOKO pillar pages intentionally share the category slug.
+ *
+ * WordPress itself normally allows a Page and a category to use the same slug,
+ * but no-category-base/permalink plugins can mark category slugs as invalid
+ * hierarchical post slugs. In that situation WordPress silently changes a
+ * pillar such as /trabajos/ to /trabajos-2/. HONOKO owns that collision on
+ * purpose and its request routing below resolves /trabajos/ to the pillar Page.
+ *
+ * Short-circuit WordPress slug uniquing only for root Pages whose requested
+ * slug matches a real category and only when another non-trashed root Page is
+ * not already using that slug.
+ */
+function honoko_pillar_page_slug_conflict( $slug, $post_id = 0 ) {
+    $existing = get_page_by_path( sanitize_title( $slug ), OBJECT, 'page' );
+    if ( ! $existing || (int) $existing->ID === (int) $post_id ) return false;
+    if ( (int) $existing->post_parent !== 0 ) return false;
+    return ! in_array( $existing->post_status, array( 'trash', 'auto-draft' ), true );
+}
+
+function honoko_pillar_preserve_category_slug( $override_slug, $slug, $post_id, $post_status, $post_type, $post_parent ) {
+    if ( 'page' !== $post_type || (int) $post_parent !== 0 ) return $override_slug;
+    if ( function_exists( 'honoko_seo_pillar_same_slug_enabled' ) && ! honoko_seo_pillar_same_slug_enabled() ) return $override_slug;
+
+    $slug = sanitize_title( $slug );
+    if ( '' === $slug ) return $override_slug;
+
+    $term = get_term_by( 'slug', $slug, 'category' );
+    if ( ! ( $term instanceof WP_Term ) ) return $override_slug;
+    if ( honoko_pillar_page_slug_conflict( $slug, $post_id ) ) return $override_slug;
+
+    return $slug;
+}
+add_filter( 'pre_wp_unique_post_slug', 'honoko_pillar_preserve_category_slug', 999, 6 );
+
+/**
+ * Persist the automatic same-slug relationship once the Page is saved.
+ * Explicit term/page mappings keep priority and are never replaced by another
+ * Page merely because it happens to use the same slug.
+ */
+function honoko_pillar_sync_same_slug_mapping( $post_id, $post, $update ) {
+    unset( $update );
+    if ( ! ( $post instanceof WP_Post ) || 'page' !== $post->post_type ) return;
+    if ( wp_is_post_revision( $post_id ) || wp_is_post_autosave( $post_id ) ) return;
+    if ( (int) $post->post_parent !== 0 || in_array( $post->post_status, array( 'trash', 'auto-draft' ), true ) ) return;
+    if ( function_exists( 'honoko_seo_pillar_same_slug_enabled' ) && ! honoko_seo_pillar_same_slug_enabled() ) return;
+
+    $term = get_term_by( 'slug', $post->post_name, 'category' );
+    if ( ! ( $term instanceof WP_Term ) ) return;
+
+    $mapped_page = absint( get_term_meta( $term->term_id, '_honoko_pillar_page_id', true ) );
+    if ( $mapped_page && $mapped_page !== (int) $post_id ) {
+        $mapped_status = get_post_status( $mapped_page );
+        if ( $mapped_status && ! in_array( $mapped_status, array( 'trash', 'auto-draft' ), true ) ) return;
+    }
+
+    update_post_meta( $post_id, '_honoko_pillar_taxonomy', 'category' );
+    update_post_meta( $post_id, '_honoko_pillar_term_id', (int) $term->term_id );
+    update_term_meta( $term->term_id, '_honoko_pillar_page_id', (int) $post_id );
+}
+add_action( 'save_post_page', 'honoko_pillar_sync_same_slug_mapping', 20, 3 );
 
 function honoko_pillar_url_for_term( $term ) {
@@ -387 +450 @@
 }, 10, 2 );
 add_filter( 'wp_insert_post_data', function( $data, $postarr ) {
+    if ( ! is_admin() || ( $data['post_type'] ?? '' ) !== 'page' || ! empty( $data['post_parent'] ) ) return $data;
+
+    $post_id = absint( $postarr['ID'] ?? 0 );
     $term_id = honoko_pillar_request_term_id();
-    if ( is_admin() && $data['post_type'] === 'page' && $term_id && empty( $data['post_name'] ) ) {
+    $target_slug = '';
+
+    // New pillar opened from HONOKO -> Pillars & clusters.
+    if ( $term_id ) {
         $term = get_term( $term_id, 'category' );
-        if ( $term && ! is_wp_error( $term ) ) $data['post_name'] = $term->slug;
-    }
+        if ( $term && ! is_wp_error( $term ) ) $target_slug = sanitize_title( $term->slug );
+    }
+
+    // Existing pillar affected by a no-category-base/permalink rule may already
+    // have been changed to slug-2. Restore the category slug when the Page title
+    // still identifies the same pillar and no real Page collision exists.
+    if ( '' === $target_slug ) {
+        $current_slug = sanitize_title( $data['post_name'] ?? '' );
+        if ( preg_match( '/^(.+)-(\\d+)$/', $current_slug, $matches ) ) {
+            $base_slug = sanitize_title( $matches[1] );
+            $term = get_term_by( 'slug', $base_slug, 'category' );
+            $title_matches = sanitize_title( $data['post_title'] ?? '' ) === $base_slug;
+            $cluster_matches = false;
+            if ( ! empty( $data['post_content'] ) ) {
+                $cluster_matches = false !== strpos( (string) $data['post_content'], 'category="' . $base_slug . '"' )
+                    || false !== strpos( (string) $data['post_content'], "category='" . $base_slug . "'" );
+            }
+            if ( $term instanceof WP_Term && ( $title_matches || $cluster_matches ) ) $target_slug = $base_slug;
+        }
+    }
+
+    if ( '' !== $target_slug && ! honoko_pillar_page_slug_conflict( $target_slug, $post_id ) ) {
+        $data['post_name'] = $target_slug;
+    }
+
     return $data;
 }, 10, 2 );

honoko-core/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 7.4
-Stable tag: 1.0.24
+Stable tag: 1.0.25
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
-A visual content builder with pillar pages, content clusters and SEO tools. Pair it with HONOKO Theme for the complete experience.
+A visual content builder with pillar pages, content clusters, and SEO tools.
 
 == Description ==
@@ -15 +15 @@
 HONOKO Core keeps persistent content functionality separate from presentation. It provides the free HONOKO Builder, Frontend Builder, pillar-page mapping, content clusters, SEO metadata, Schema markup, XML sitemap generation and the free HONOKO block set.
 
-HONOKO Builder works independently with third-party WordPress themes. Install HONOKO Core on your existing WordPress site and use HONOKO Builder to build pages with rows, columns and blocks without changing your current theme.
-
-**Get the complete HONOKO experience with HONOKO Theme.**
-
-HONOKO Theme is designed specifically for HONOKO Core and provides the intended visual presentation and Builder workflow.
-
-[Download HONOKO Theme from the official website](https://honokotheme.com/)
-
-The plugin can remain active when you change themes, so Builder content and SEO data are not tied to a specific presentation layer. HONOKO Core can also be used with third-party WordPress themes.
+The plugin can remain active when you change themes, so Builder content and SEO data are not tied to a specific presentation layer.
 
 HONOKO Core is fully functional without HONOKO Pro. An optional premium add-on is available separately and is not included in this plugin.
@@ -33 +25 @@
 = Do I need the HONOKO theme? =
 
-No. HONOKO Core also works with third-party WordPress themes and keeps its persistent content features available when you change themes.
-
-For the intended HONOKO visual presentation and complete Builder workflow, use the free HONOKO Theme:
-
-[Get HONOKO Theme](https://honokotheme.com/)
+No. Core keeps its persistent content features available when another theme is active. The HONOKO theme provides the intended visual presentation.
 
 = Does Core send site content to HONOKO servers? =
@@ -48 +36 @@
 
 == Changelog ==
+
+= 1.0.25 =
+* Keeps category pillar pages on the exact category slug when no-category-base or permalink rules would otherwise append a numeric suffix such as `-2`.
+* Automatically syncs the category and Page mapping after a same-slug pillar is saved.
+* Repairs an existing suffixed pillar slug on the next save when its title or HONOKO cluster block clearly matches the category.
 
 = 1.0.24 =
@@ -84 +77 @@
 * Uses an English source msgid for the Quote block so English installations no longer see a Spanish label.
 
+
 = 1.0.17 =
 * Removed the auxiliary SOURCE.md file from the production package; source-code/build documentation remains in readme.txt.
@@ -118 +112 @@
 == Upgrade Notice ==
 
+= 1.0.25 =
+Fixes same-slug category pillar URLs so HONOKO can keep `/category-slug/` instead of WordPress changing the Page to `/category-slug-2/`.
+
 = 1.0.24 =
 Keeps each post in HONOKO Builder after choosing Builder on third-party themes, until the WordPress editor is explicitly selected.
@@ -142 +139 @@
 == Resources ==
 
-Official HONOKO website and HONOKO Theme:
-https://honokotheme.com/
-
 HONOKO Builder icon artwork, Copyright 2026 Carlos Banyuls.
 License: GPL-2.0-or-later.
+Source: https://honokotheme.com/