Changeset 7756 for trunk/bp-core/bp-core-avatars.php

Timestamp:

01/24/2014 11:48:48 PM (11 years ago)

Author:

johnjamesjacoby

Message:

Replace BP_PLUGIN_DIR and BP_PLUGIN_URL constant usages with plugin_dir and plugin_url BuddyPress variables, respectively. Also replaces $bp global touches with buddypress() calls within the above scopes.

File:

• trunk/bp-core/bp-core-avatars.php (modified) (4 diffs)

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

@@ -13 +13 @@
 function bp_core_set_avatar_constants() {
 
+    $bp = buddypress();
+
     if ( !defined( 'BP_AVATAR_THUMB_WIDTH' ) )
         define( 'BP_AVATAR_THUMB_WIDTH', 50 );
@@ -29 +31 @@
 
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
-
-        $bp = buddypress();
 
         if ( !isset( $bp->site_options['fileupload_maxk'] ) ) {
@@ -40 +40 @@
 
     if ( !defined( 'BP_AVATAR_DEFAULT' ) )
-        define( 'BP_AVATAR_DEFAULT', BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg' );
+        define( 'BP_AVATAR_DEFAULT', $bp->plugin_url . 'bp-core/images/mystery-man.jpg' );
 
     if ( !defined( 'BP_AVATAR_DEFAULT_THUMB' ) )
-        define( 'BP_AVATAR_DEFAULT_THUMB', BP_PLUGIN_URL . 'bp-core/images/mystery-man-50.jpg' );
+        define( 'BP_AVATAR_DEFAULT_THUMB', $bp->plugin_url . 'bp-core/images/mystery-man-50.jpg' );
 
     if ( ! defined( 'BP_SHOW_AVATARS' ) ) {
@@ -472 +472 @@
     // No avatar was found, and we've been told not to use a gravatar.
     } else {
-        $gravatar = apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params );
+        $gravatar = apply_filters( "bp_core_default_avatar_$object", $bp->plugin_url . 'bp-core/images/mystery-man.jpg', $params );
     }