Changeset 5473

Timestamp:

12/09/2011 04:50:49 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Add some brackets and whitespace to avatar and core slug functions to improve readability.

Location:

trunk

Files:

• bp-core/bp-core-avatars.php (modified) (3 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)

trunk/bp-core/bp-core-avatars.php

@@ -32 +32 @@
 
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
-        if ( !isset( $bp->site_options['fileupload_maxk'] ) )
+        if ( !isset( $bp->site_options['fileupload_maxk'] ) ) {
             define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); // 5mb
-        else
+        } else {
             define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', $bp->site_options['fileupload_maxk'] * 1024 );
+        }
     }
 
@@ -48 +49 @@
 function bp_core_set_avatar_globals() {
     global $bp;
-    
+
     // Dimensions
     $bp->avatar->thumb->width      = BP_AVATAR_THUMB_WIDTH;
@@ -54 +55 @@
     $bp->avatar->full->width       = BP_AVATAR_FULL_WIDTH;
     $bp->avatar->full->height      = BP_AVATAR_FULL_HEIGHT;
-    
+
     // Upload maximums
     $bp->avatar->original_max_width    = BP_AVATAR_ORIGINAL_MAX_WIDTH;
     $bp->avatar->original_max_filesize = BP_AVATAR_ORIGINAL_MAX_FILESIZE;
-    
+
     // Defaults
-    $bp->avatar->thumb->default        = BP_AVATAR_DEFAULT_THUMB;
-    $bp->avatar->full->default     = BP_AVATAR_DEFAULT;
-    
+    $bp->avatar->thumb->default = BP_AVATAR_DEFAULT_THUMB;
+    $bp->avatar->full->default  = BP_AVATAR_DEFAULT;
+
     // These have to be set on page load in order to avoid infinite filter loops at runtime
-    $bp->avatar->upload_path       = bp_core_avatar_upload_path();
-    $bp->avatar->url           = bp_core_avatar_url();
-    
+    $bp->avatar->upload_path = bp_core_avatar_upload_path();
+    $bp->avatar->url         = bp_core_avatar_url();
+
     do_action( 'bp_core_set_avatar_globals' );
 }

trunk/bp-members/bp-members-functions.php

@@ -40 +40 @@
 
     // No custom members slug
-    if ( !defined( 'BP_MEMBERS_SLUG' ) )
-        if ( !empty( $bp->pages->members ) )
+    if ( !defined( 'BP_MEMBERS_SLUG' ) ) {
+        if ( !empty( $bp->pages->members ) ) {
             define( 'BP_MEMBERS_SLUG', $bp->pages->members->slug );
-        else
+        } else {
             define( 'BP_MEMBERS_SLUG', 'members' );
+        }
+    }
 
     // No custom registration slug
-    if ( !defined( 'BP_REGISTER_SLUG' ) )
-        if ( !empty( $bp->pages->register ) )
+    if ( !defined( 'BP_REGISTER_SLUG' ) ) {
+        if ( !empty( $bp->pages->register ) ) {
             define( 'BP_REGISTER_SLUG', $bp->pages->register->slug );
-        else
+        } else {
             define( 'BP_REGISTER_SLUG', 'register' );
+        }
+    }
 
     // No custom activation slug
-    if ( !defined( 'BP_ACTIVATION_SLUG' ) )
-        if ( !empty( $bp->pages->activate ) )
+    if ( !defined( 'BP_ACTIVATION_SLUG' ) ) {
+        if ( !empty( $bp->pages->activate ) ) {
             define( 'BP_ACTIVATION_SLUG', $bp->pages->activate->slug );
-        else
+        } else {
             define( 'BP_ACTIVATION_SLUG', 'activate' );
-
-}
-add_action( 'bp_setup_globals', 'bp_core_define_slugs' );
+        }
+    }
+}
+add_action( 'bp_setup_late_globals', 'bp_core_define_slugs' );
 
 /**