Fix conflict with page rewrite rule. (#34)

* Fix coflict with page rewrite rule.

Author: athlan

includes/class-wp-rewrite-rules.php

@@ -62,6 +62,10 @@ public function rewrite_rules_array_filter( $rules ) {
 
 		foreach ( $rules as $key => $rule ) {
 			if ( preg_match_all( '/' . self::FIELD_REGEXP . '/', $key, $key_matches ) ) {
+				if ( $this->conflicts_with_page_permalink( $key, $key_matches ) ) {
+					continue;
+				}
+
 				$key_new = preg_replace(
 					'/' . self::FIELD_REGEXP . '/',
 					'([^/]+)',
@@ -140,4 +144,22 @@ private function build_rule_on_field_match( $key_matches, $i ) {
 
 		return http_build_query( $rule_rewrite );
 	}
+
+	/**
+	 * Determines if rewrite rule contains only custom field tag and conflicts with pages permalink.
+	 *
+	 * @param string $key Rewrite rule.
+	 * @param array  $key_matches All found matches.
+	 *
+	 * @access private
+	 * @return boolean Whether rewrite rule conflicts with page rule.
+	 */
+	private function conflicts_with_page_permalink( $key, $key_matches ) {
+		if ( count( $key_matches[ self::FIELD_REGEXP_MAIN_GROUP ] ) == 1 ) {
+			// If the rewrite rule is only %field_some%/?$ it will be in conflict with pages rewrite rule.
+			return preg_match( '/^' . self::FIELD_REGEXP . '\/\?\$$/', $key );
+		}
+
+		return false;
+	}
 }

test/integration/suites/MetaKeyPermalinkStructure/PageWithMetaKey.php

@@ -41,7 +41,7 @@ function test_generates_permalink_to_page_not_using_meta_key() {
 	/**
 	 * Test case.
 	 */
-	function IGNORE_test_go_to_page_not_using_meta_key_permalink_structure() {
+	function test_go_to_page_not_using_meta_key_permalink_structure() {
 		// given.
 		$this->permalink_steps->given_permalink_structure( '/%field_some_meta_key%/%postname%/' );