Changeset 6331

Timestamp:

02/27/2017 10:54:08 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Bootstrap: Split setup_globals() up into 2 methods:

• setup_environment() to handle directories, paths, urls, etc...
• setup_variables() to handle queries, rewrite rules, bbPress specific "globals", etc...

This will allow us to use included functions as default variables later.

File:

• trunk/src/bbpress.php (modified) (5 diffs)

trunk/src/bbpress.php

@@ -113 +113 @@
         if ( null === $instance ) {
             $instance = new bbPress;
-            $instance->setup_globals();
+            $instance->setup_environment();
             $instance->includes();
+            $instance->setup_variables();
             $instance->setup_actions();
         }
@@ -190 +191 @@
 
     /**
-     * Set some smart defaults to class variables. Allow some of them to be
-     * filtered to allow for early overriding.
+     * Setup the environment variables to allow the rest of bbPress to function
+     * more easily.
      *
      * @since 2.0.0 bbPress (r2626)
@@ -200 +201 @@
      * @uses apply_filters() Calls various filters
      */
-    private function setup_globals() {
+    private function setup_environment() {
 
         /** Versions **********************************************************/
@@ -227 +228 @@
         $this->themes_dir   = apply_filters( 'bbp_themes_dir',   trailingslashit( $this->plugin_dir . 'templates' ) );
         $this->themes_url   = apply_filters( 'bbp_themes_url',   trailingslashit( $this->plugin_url . 'templates' ) );
+    }
+
+    /**
+     * Smart defaults to many bbPress specific class variables.
+     *
+     * @since 2.6.0 bbPress (r6330)
+     */
+    private function setup_variables() {
 
         /** Identifiers *******************************************************/
@@ -265 +274 @@
         $this->current_reply_id     = 0; // Current reply id
         $this->current_topic_tag_id = 0; // Current topic tag id
-
-        $this->forum_query    = new WP_Query(); // Main forum query
-        $this->topic_query    = new WP_Query(); // Main topic query
-        $this->reply_query    = new WP_Query(); // Main reply query
-        $this->search_query   = new WP_Query(); // Main search query
+        $this->current_user_id      = 0; // Current topic tag id
+
+        $this->forum_query    = new WP_Query();      // Main forum query
+        $this->topic_query    = new WP_Query();      // Main topic query
+        $this->reply_query    = new WP_Query();      // Main reply query
+        $this->search_query   = new WP_Query();      // Main search query
+        $this->user_query     = new WP_User_Query(); // Main user query
 
         /** Theme Compat ******************************************************/