refactor: improve CPT registration with proper name and front-end URL structure

Author: ajaydsouza

includes/class-cpt.php

@@ -82,7 +82,7 @@ public static function register_post_type() {
 		$ptlabels = apply_filters( 'wzkb_post_type_labels', $ptlabels );
 
 		$ptargs = array(
-			'label'         => __( 'wz_knowledgebase', 'knowledgebase' ),
+			'name'          => 'wz_knowledgebase',
 			'description'   => __( 'Knowledge Base', 'knowledgebase' ),
 			'labels'        => $ptlabels,
 			'supports'      => array( 'title', 'editor', 'thumbnail', 'excerpt', 'revisions', 'author', 'custom-fields', 'comments' ),
@@ -95,6 +95,7 @@ public static function register_post_type() {
 			'map_meta_cap'  => true,
 			'has_archive'   => $archives,
 			'rewrite'       => $rewrite,
+			'query_var'     => true,
 		);
 
 		/**
@@ -127,7 +128,7 @@ private static function get_taxonomy_base_args( string $slug, bool $is_hierarchi
 			'show_tagcloud'     => ! $is_hierarchical,
 			'rewrite'           => array(
 				'slug'         => $slug,
-				'with_front'   => true,
+				'with_front'   => false,
 				'hierarchical' => $is_hierarchical,
 			),
 		);

includes/class-main.php

@@ -8,7 +8,6 @@
 namespace WebberZone\Knowledge_Base;
 
 use WebberZone\Knowledge_Base\Admin\Admin;
-use WebberZone\Knowledge_Base\Pro\Pro;
 use WebberZone\Knowledge_Base\Util\Hook_Registry;
 
 if ( ! defined( 'WPINC' ) ) {
@@ -42,9 +41,9 @@ final class Main {
 	 *
 	 * @since 3.0.0
 	 *
-	 * @var Pro|null Pro instance.
+	 * @var Pro\Pro|null Pro instance.
 	 */
-	public ?Pro $pro = null;
+	public ?Pro\Pro $pro = null;
 
 	/**
 	 * Shortcodes.
@@ -182,7 +181,7 @@ private function init() {
 
 		// Conditionally load Pro if available.
 		if ( class_exists( 'WebberZone\\Knowledge_Base\\Pro\\Pro' ) ) {
-			$this->pro = new Pro();
+			$this->pro = new Pro\Pro();
 		}
 
 		if ( is_admin() ) {
@@ -210,7 +209,7 @@ public function initiate_plugin() {
 	}
 
 	/**
-	 * Initialise the Better Search widgets.
+	 * Initialise the Knowledge Base widgets.
 	 *
 	 * @since 2.3.0
 	 */