Changeset 3505 for branches/plugin/bbp-includes/bbp-core-shortcodes.php

Timestamp:

09/10/2011 10:27:19 PM (13 years ago)

Author:

johnjamesjacoby

Message:

API adjustments:

• Refactor _status_ vars into callable functions.
• Audit usage of $bbp global.
• Perform get_class() checks on extensions to avoid errors if global $bbp is overloaded.
• Bump DB version to 175.

File:

• branches/plugin/bbp-includes/bbp-core-shortcodes.php (modified) (5 diffs)

branches/plugin/bbp-includes/bbp-core-shortcodes.php

@@ -757 +757 @@
      * @since bbPress (r3302)
      *
-     * @global bbPress $bbp
-     *
      * @return string
      */
     public function display_login() {
-        global $bbp;
 
         // Unset globals
@@ -785 +782 @@
      * @since bbPress (r3302)
      *
-     * @global bbPress $bbp
-     *
      * @return string
      */
     public function display_register() {
-        global $bbp;
 
         // Unset globals
@@ -813 +807 @@
      * @since bbPress (r3302)
      *
-     * @global bbPress $bbp
-     *
      * @return string
      */
     public function display_lost_pass() {
-        global $bbp;
 
         // Unset globals
@@ -842 +833 @@
      *
      * @since bbPress (r3302)
-     *
-     * @global bbPress $bbp
      *
      * @return string
@@ -875 +864 @@
     global $bbp;
 
+    // Bail if bbPress is not loaded
+    if ( 'bbPress' !== get_class( $bbp ) ) return;
+
     $bbp->shortcodes = new BBP_Shortcodes();
 }