Changeset 4294

Timestamp:

10/25/2016 09:59:19 PM (8 years ago)

Author:

coffee2code

Message:

Handbook plugin: Change handling for noting is_handbook_root.

See ​#core38401.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/handbook.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/handbook.php

@@ -123 +123 @@
         add_action( 'template_redirect',                  array( $this, 'redirect_handbook_root_page' ) );
         add_filter( 'template_include',                   array( $this, 'template_include' ) );
-        add_filter( 'query_vars',                         array( $this, 'add_query_vars' ) );
         add_filter( 'pre_get_posts',                      array( $this, 'pre_get_posts' ) );
         add_action( 'widgets_init',                       array( $this, 'handbook_sidebar' ), 11 ); // After P2
@@ -274 +273 @@
      */
     function redirect_handbook_root_page() {
+        global $wp_query;
+
         if ( is_singular( $this->post_type )
             &&
             ! is_preview()
             &&
-            ! get_query_var( 'is_handbook_root' )
+            ! $wp_query->is_handbook_root
             &&
             in_array( get_query_var( 'name' ), array( $this->post_type, substr( $this->post_type, 0, -9 ) ) )
@@ -297 +298 @@
      */
     function template_include( $template ) {
+        global $wp_query;
+
         $handbook_templates = array();
 
@@ -304 +307 @@
         }
         // For handbook landing page.
-        elseif ( get_query_var( 'is_handbook_root' ) && get_query_var( 'handbook' ) === $this->post_type ) {
+        elseif ( $wp_query->is_handbook_root && get_query_var( 'handbook' ) === $this->post_type ) {
             if ( 'handbook' !== $this->post_type ) {
                 $handbook_templates[] = "single-{$this->post_type}.php";
@@ -320 +323 @@
     }
 
-    /**
-     * Add public query vars for handbooks.
-     *
-     * @param array  $public_query_vars The array of whitelisted query variables.
-     * @return array Array with public query vars.
-     */
-    function add_query_vars( $public_query_vars ) {
-        $public_query_vars['is_handbook_root'] = false;
-
-        return $public_query_vars;
-    }
-
     function pre_get_posts( $query ) {
+        $query->is_handbook_root = false;
+
         if ( $query->is_main_query() && ! $query->is_admin && ! $query->is_search && $query->is_post_type_archive( $this->post_type ) ) {
             // If the post type has a page to act as an archive index page, get that.
@@ -342 +335 @@
             if ( $page ) {
                 $query->set( 'p', $page->ID );
-                $query->set('is_handbook_root', true );
+                $query->is_handbook_root     = true;
 
                 $query->is_archive           = false;