Changeset 6317 for trunk/bp-settings/bp-settings-loader.php

Timestamp:

09/07/2012 02:50:43 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Settings:

• General code clean-up.
• php5ize the loader.
• Remove closing php tags.
• Limit creation of one-time-use variables.
• Bail early instead of wrap in big if statements.

File:

• trunk/bp-settings/bp-settings-loader.php (modified) (7 diffs)

trunk/bp-settings/bp-settings-loader.php

@@ -18 +18 @@
      * @since BuddyPress (1.5)
      */
-    function __construct() {
+    public function __construct() {
         parent::start(
             'settings',
@@ -31 +31 @@
      * @global BuddyPress $bp The one true BuddyPress instance
      */
-    function includes() {
-        // Files to include
-        $includes = array(
+    public function includes() {
+        parent::includes( array(
             'actions',
             'screens',
             'template',
             'functions',
-        );
-
-        parent::includes( $includes );
+        ) );
     }
 
@@ -51 +48 @@
      * @since BuddyPress (1.5)
      */
-    function setup_globals() {
+    public function setup_globals() {
 
         // Define a slug, if necessary
@@ -58 +55 @@
 
         // All globals for settings component.
-        $globals = array(
+        parent::setup_globals( array(
             'slug'          => BP_SETTINGS_SLUG,
             'has_directory' => false,
-        );
-
-        parent::setup_globals( $globals );
+        ) );
     }
 
@@ -69 +64 @@
      * Setup BuddyBar navigation
      */
-    function setup_nav() {
+    public function setup_nav() {
 
         // Define local variable
@@ -147 +142 @@
     /**
      * Set up the Toolbar
-     *
-     * @global BuddyPress $bp The one true BuddyPress instance
-     */
-    function setup_admin_bar() {
-        global $bp;
+     */
+    public function setup_admin_bar() {
+
+        // The instance
+        $bp = buddypress();
 
         // Prevent debug notices
@@ -203 +198 @@
 
 function bp_setup_settings() {
-    global $bp;
-    $bp->settings = new BP_Settings_Component();
+    buddypress()->settings = new BP_Settings_Component();
 }
 add_action( 'bp_setup_components', 'bp_setup_settings', 6 );
-
-?>