Changeset 5956

Timestamp:

04/01/2012 09:58:29 PM (13 years ago)

Author:

djpaul

Message:

Fix https URL handling for gravatars and other BuddyPress content

Location:

trunk

Files:

• bp-core/bp-core-avatars.php (modified) (4 diffs)
• bp-loader.php (modified) (1 diff)

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

@@ -235 +235 @@
     $avatar_loc->path  = trailingslashit( bp_core_avatar_upload_path() );
     $avatar_loc->url   = trailingslashit( bp_core_avatar_url() );
+
     $avatar_loc->dir   = trailingslashit( $avatar_dir );
     $avatar_folder_url = apply_filters( 'bp_core_avatar_folder_url', ( $avatar_loc->url  . $avatar_loc->dir . $item_id ), $item_id, $object, $avatar_dir );
@@ -776 +777 @@
     if ( isset( $bp->avatar->url ) ) {
         $baseurl = $bp->avatar->url;
+
     } else {
         // If this value has been set in a constant, just use that
@@ -790 +792 @@
             } else {
                 $baseurl = $upload_dir['baseurl'];
-        
+
+                // If we're using https, update the protocol. Workaround for WP13941, WP15928, WP19037.
+                if ( is_ssl() )
+                    $baseurl = str_replace( 'http://', 'https://', $baseurl );
+
                 // If multisite, and current blog does not match root blog, make adjustments
                 if ( is_multisite() && bp_get_root_blog_id() != get_current_blog_id() )
@@ -796 +802 @@
             }
         }
-        
+
         // Stash in $bp for later use
         $bp->avatar->url = $baseurl;

trunk/bp-loader.php

@@ -360 +360 @@
             define( 'BP_PLUGIN_DIR', trailingslashit( WP_PLUGIN_DIR . '/buddypress' ) );
 
-        if ( !defined( 'BP_PLUGIN_URL' ) )
-            define( 'BP_PLUGIN_URL', plugin_dir_url ( __FILE__ ) );
+        if ( !defined( 'BP_PLUGIN_URL' ) ) {
+            $plugin_url = plugin_dir_url( __FILE__ );
+
+            // If we're using https, update the protocol. Workaround for WP13941, WP15928, WP19037.
+            if ( is_ssl() )
+                $plugin_url = str_replace( 'http://', 'https://', $plugin_url );
+
+            define( 'BP_PLUGIN_URL', $plugin_url );
+        }
 
         // The search slug has to be defined nice and early because of the way