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

Timestamp:

10/26/2012 05:13:59 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Avatars:

• Obey 'show_avatars' option, and bail early if avatars are totally disabled.
• Replace $bp global with buddypress() usage in bp-core-avatars.php.

File:

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

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

@@ -12 +12 @@
  */
 function bp_core_set_avatar_constants() {
-    global $bp;
 
     if ( !defined( 'BP_AVATAR_THUMB_WIDTH' ) )
@@ -30 +29 @@
 
     if ( !defined( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE' ) ) {
+
+        $bp = buddypress();
+
         if ( !isset( $bp->site_options['fileupload_maxk'] ) ) {
             define( 'BP_AVATAR_ORIGINAL_MAX_FILESIZE', 5120000 ); // 5mb
@@ -46 +48 @@
 
 function bp_core_set_avatar_globals() {
-    global $bp;
+    $bp = buddypress();
 
     $bp->avatar        = new stdClass;
@@ -88 +90 @@
  * default, but can be extended to include your own custom components too.
  *
- * @global BuddyPress $bp The one true BuddyPress instance
  * @global $current_blog WordPress global containing information and settings for the current blog being viewed.
  * @param array $args Determine the output of this function
@@ -94 +95 @@
  */
 function bp_core_fetch_avatar( $args = '' ) {
-    global $bp, $current_blog;
+
+    // If avatars are disabled for the root site, obey that request and bail
+    if ( ! bp_get_option( 'show_avatars' ) )
+        return;
+
+    global $current_blog;
+
+    $bp = buddypress();
 
     // Set a few default variables
@@ -373 +381 @@
     // 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 = urlencode( apply_filters( "bp_core_default_avatar_$object", BP_PLUGIN_URL . 'bp-core/images/mystery-man.jpg', $params ) );
     }
 
     if ( true === $html )
-        return apply_filters( 'bp_core_fetch_avatar', '<img src="' . $gravatar . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
+        return apply_filters( 'bp_core_fetch_avatar', '<img src="' . esc_attr( $gravatar ) . '" alt="' . esc_attr( $alt ) . '" class="' . esc_attr( $class ) . '"' . $css_id . $html_width . $html_height . $title . ' />', $params, $item_id, $avatar_dir, $css_id, $html_width, $html_height, $avatar_folder_url, $avatar_folder_dir );
     else
         return apply_filters( 'bp_core_fetch_avatar_url', $gravatar );
@@ -390 +398 @@
  *  avatar_dir - The directory where the avatars to be uploaded.
  *
- * @global object $bp BuddyPress global settings
  * @param mixed $args
  * @return bool Success/failure
  */
 function bp_core_delete_existing_avatar( $args = '' ) {
-    global $bp;
 
     $defaults = array(
@@ -410 +416 @@
             $item_id = bp_displayed_user_id();
         else if ( 'group' == $object )
-            $item_id = $bp->groups->current_group->id;
+            $item_id = buddypress()->groups->current_group->id;
         else if ( 'blog' == $object )
             $item_id = $current_blog->id;
@@ -459 +465 @@
  * If everything checks out, crop the image and move it to its real location.
  *
- * @global object $bp BuddyPress global settings
  * @param array $file The appropriate entry the from $_FILES superglobal.
  * @param string $upload_dir_filter A filter to be applied to upload_dir
@@ -467 +472 @@
  */
 function bp_core_avatar_handle_upload( $file, $upload_dir_filter ) {
-    global $bp;
 
     /***
@@ -505 +509 @@
     // Filter the upload location
     add_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
+
+    $bp = buddypress();
 
     $bp->avatar_admin->original = wp_handle_upload( $file['file'], array( 'action'=> 'bp_avatar_upload' ) );
@@ -736 +742 @@
  */
 function bp_core_avatar_upload_path() {
-    global $bp;
+    $bp = buddypress();
 
     // See if the value has already been calculated and stashed in the $bp global
@@ -782 +788 @@
  */
 function bp_core_avatar_url() {
-    global $bp;
+    $bp = buddypress();
 
     // See if the value has already been calculated and stashed in the $bp global
@@ -850 +856 @@
  */
 function bp_core_avatar_dimension( $type = 'thumb', $h_or_w = 'height' ) {
-    global $bp;
-
+    $bp  = buddypress();
     $dim = isset( $bp->avatar->{$type}->{$h_or_w} ) ? (int) $bp->avatar->{$type}->{$h_or_w} : false;
 
@@ -914 +919 @@
  */
 function bp_core_avatar_original_max_width() {
-    global $bp;
-
-    return apply_filters( 'bp_core_avatar_original_max_width', (int) $bp->avatar->original_max_width );
+    return apply_filters( 'bp_core_avatar_original_max_width', (int) buddypress()->avatar->original_max_width );
 }
 
@@ -928 +931 @@
  */
 function bp_core_avatar_original_max_filesize() {
-    global $bp;
-
-    return apply_filters( 'bp_core_avatar_original_max_filesize', (int) $bp->avatar->original_max_filesize );
+    return apply_filters( 'bp_core_avatar_original_max_filesize', (int) buddypress()->avatar->original_max_filesize );
 }
 
@@ -942 +943 @@
  */
 function bp_core_avatar_default() {
-    global $bp;
-
-    return apply_filters( 'bp_core_avatar_default', $bp->avatar->full->default );
+    return apply_filters( 'bp_core_avatar_default', buddypress()->avatar->full->default );
 }
 
@@ -956 +955 @@
  */
 function bp_core_avatar_default_thumb() {
-    global $bp;
-
-    return apply_filters( 'bp_core_avatar_thumb', $bp->avatar->thumb->default );
-}
+    return apply_filters( 'bp_core_avatar_thumb', buddypress()->avatar->thumb->default );
+}