← All changes | includes/Core/Rewrite.php +17 -18 4.5.2 → 4.2.0 View file →

		@@ -201,9 +201,9 @@
201	201	function ( $carry, $item ) {
202	202	$carry .= ( strpos( $item, '%' ) !== false ? '([^/]+)' : $item ) . '/';
203	203	return $carry;
204	204	},
205		- '^'
	205	+ ''
206	206	) . '?$';
207	207	}
208	208
209	209	public function make_query( $segments ) {
		@@ -241,18 +241,29 @@
241	241	$hierarchy_slug = $this->hierarchy_based_slug_switch();
242	242
243	243	// Add rule to handle pagination attempts
244	244	$this->add_rewrite_rule(
245		- '^' . $base . '/page/([0-9]+)/?$',
	245	+ $base . '/page/([0-9]+)/?$',
246	246	'index.php?post_type=docs',
247	247	'top'
248	248	);
249	249
250	250	$base = $this->get_base_slug();
251		- $this->add_rewrite_rule( '^' . $base . '/(feed|rdf|rss|rss2|atom)/?$', 'index.php?post_type=docs&feed=$matches[1]' );
252		- $this->add_rewrite_rule( '^' . $base . '/authors/([0-9]+)/?$', 'index.php?post_type=docs&author=$matches[1]' );
253		- $this->add_rewrite_rule( '^' . $base . '/authors/([0-9]+)/page/([0-9]+)/?$', 'index.php?post_type=docs&author=$matches[1]&page=$matches[2]' );
	251	+ $this->add_rewrite_rule( $base . '/(feed|rdf|rss|rss2|atom)/?$', 'index.php?post_type=docs&feed=$matches[1]' );
	252	+ $this->add_rewrite_rule( $base . '/authors/([0-9]+)/?$', 'index.php?post_type=docs&author=$matches[1]' );
	253	+ $this->add_rewrite_rule( $base . '/authors/([0-9]+)/page/([0-9]+)/?$', 'index.php?post_type=docs&author=$matches[1]&page=$matches[2]' );
254	254
	255	+ if( $hierarchy_slug ) { // reigster hierarchy based slug rewrite rule, for single doc permalink
	256	+ $this->add_rewrite_rule( $base . '/(.+?)/([^/]+)(?:/([0-9]+))?/?$', 'index.php?doc_category=$matches[1]&docs=$matches[2]&post_type=docs' );
	257	+
	258	+ $rewrite_rules = get_option('rewrite_rules');
	259	+
	260	+ if( ! isset( $rewrite_rules[$base . '/(.+?)/([^/]+)(?:/([0-9]+))?/?$'] ) ) { // if this nested rule is not set then flush the rules
	261	+ error_log(12);
	262	+ flush_rewrite_rules();
	263	+ }
	264	+ }
	265	+
255	266	/**
256	267	* This code of blocks used to determine single docs permalink.
257	268	*/
258	269	$_docs_perma_struct = betterdocs()->settings->get( 'permalink_structure', 'docs' );
		@@ -257,20 +268,8 @@
257	268	*/
258	269	$_docs_perma_struct = betterdocs()->settings->get( 'permalink_structure', 'docs' );
259	270	$_normalized_structure = $this->normalzie_doc_perma_structure( $_docs_perma_struct );
260	271
261		- if( $hierarchy_slug ) { // register hierarchy based slug rewrite rule, for single doc permalink
262		- // When MKB or WPML is used, the actual base for single docs might differ from the generic $base
263		- $perma_base = isset( $_normalized_structure['raw'][0] ) && strpos( $_normalized_structure['raw'][0], '%' ) === false
264		- ? $_normalized_structure['raw'][0]
265		- : $base;
266		-
267		- $this->add_rewrite_rule( '^' . $perma_base . '/(.+?)/([^/]+)(?:/([0-9]+))?/?$', 'index.php?doc_category=$matches[1]&docs=$matches[2]&post_type=docs', 'top' );
268		-
269		- // Removed flush_rewrite_rules() from here. Calling flush_rewrite_rules() on the 'init' hook causes
270		- // infinite database updates and destroys custom rules when WPML or MKB dynamically filters keys.
271		- }
272		-
273	272	$_feed_regex = $_normalized_structure['raw'];
274	273	$_feed_regex[] = '(feed|rdf|rss|rss2|atom)';
275	274	$_feed_group = $_normalized_structure['group'];
276	275	$_feed_group[] = '%feed%';
		@@ -281,9 +280,9 @@
281	280	$this->make_regex( $_normalized_structure['raw'] ),
282	281	$this->make_query( $_normalized_structure['group'] )
283	282	);
284	283
285		- $this->add_rewrite_rule( '^' . $base . '/(feed|rdf|rss|rss2|atom)/?$', 'index.php?post_type=docs&feed=$matches[1]' );
	284	+ $this->add_rewrite_rule( $base . '/(feed|rdf|rss|rss2|atom)/?$', 'index.php?post_type=docs&feed=$matches[1]' );
286	285	}
287	286
288	287	public function add_rewrite_rule( $regex, $query, $after = 'top' ) {
289	288	add_rewrite_rule( $regex, $query, $after );