Ticket #20509: 20509.patch

wp-includes/plugin.php

@@ -595 +595 @@
         return trailingslashit( plugins_url( '', $file ) );
 }
 
+function register_generic_plugin_template( $file ) {
+        global $wp_generic_plugin_template;
+        $wp_generic_plugin_template = $file;
+}
+
+function get_generic_plugin_template() {
+        global $wp_generic_plugin_template;
+        return $wp_generic_plugin_template ? $wp_generic_plugin_template : false;
+}
+
 /**
  * Set the activation hook for a plugin.
  *

wp-includes/query.php

@@ -715 +715 @@
 }
 
 /**
+ * Is the query a generic request?
+ *
+ * @see WP_Query::is_generic_request()
+ * @since 3.4
+ * @uses $wp_query
+ *
+ * @return bool
+ */
+function is_generic_request() {
+        global $wp_query;
+
+        if ( ! isset( $wp_query ) ) {
+                _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+                return false;
+        }
+
+        return $wp_query->is_generic_request();
+}
+
+/**
  * Is the query the main query?
  *
  * @since 3.3.0
@@ -1177 +1197 @@
         var $is_404 = false;
 
         /**
+         * Set if query is a generic request.
+         *
+         * @since 3.4
+         * @access public
+         * @var bool
+         */
+        var $is_generic_request = false;
+
+        /**
          * Set if query is within comments popup window.
          *
          * @since 1.5.0
@@ -1305 +1334 @@
                 $this->is_trackback = false;
                 $this->is_home = false;
                 $this->is_404 = false;
+                $this->is_generic_request = false;
                 $this->is_comments_popup = false;
                 $this->is_paged = false;
                 $this->is_admin = false;
@@ -3501 +3531 @@
         }
 
         /**
+         * Is the query a generic request?
+         *
+         * @since 3.4
+         *
+         * @return bool
+         */
+        function is_generic_request() {
+                return (bool) $this->is_generic_request;
+        }
+
+        /**
          * Is the query the main query?
          *
          * @since 3.3.0

wp-includes/template-loader.php

@@ -20 +20 @@
 
 if ( defined('WP_USE_THEMES') && WP_USE_THEMES ) :
         $template = false;
-        if     ( is_404()            && $template = get_404_template()            ) :
+        if     ( is_generic_request() && $template = get_generic_request_template() ) :
+        elseif ( is_404()            && $template = get_404_template()            ) :
         elseif ( is_search()         && $template = get_search_template()         ) :
         elseif ( is_tax()            && $template = get_taxonomy_template()       ) :
         elseif ( is_front_page()     && $template = get_front_page_template()     ) :

wp-includes/template.php

@@ -52 +52 @@
 }
 
 /**
+ * Retrieve path of generic request template in current or parent template.
+ *
+ * @since 3.4
+ *
+ * @return string
+ */
+function get_generic_request_template() {
+        $generic = get_query_template('generic');
+
+        if ( !$generic )
+                $generic = get_generic_plugin_template();
+
+        if ( !$generic )
+                $generic = get_index_template();
+
+        return $generic;
+}
+
+/**
  * Retrieve path of archive template in current or parent template.
  *
  * @since 1.5.0