Ticket #6290: 6290.wp39.patch

src/bp-core/bp-core-attachments.php

@@ -6 +6 @@
  * @subpackage Attachments
  */
 
+
 // Exit if accessed directly
 defined( 'ABSPATH' ) || exit;
 
 /**
+ * Check if the current WordPress version is using Plupload 2.1.1
+ *
+ * Plupload 2.1.1 was introduced in WordPress 3.9. Our bp-plupload.js
+ * script requires it. So we need to make sure the current WordPress
+ * match with our needs.
+ *
+ * @since  BuddyPress (2.3.0)
+ *
+ * @return bool True if WordPress is 3.9+, false otherwise
+ */
+function bp_attachments_is_wp_version_supported() {
+        return (bool) version_compare( bp_get_major_wp_version(), '3.9', '>=' );
+}
+
+/**
  * Get the BuddyPress Plupload settings
  *
  * @since  BuddyPress (2.3.0)

src/bp-core/bp-core-avatars.php

@@ -1793 +1793 @@
 function bp_avatar_is_front_edit() {
         $retval = false;
 
+        // No need to carry on if the current WordPress version is not supported.
+        if ( ! bp_attachments_is_wp_version_supported() ) {
+                return $retval;
+        }
+
         if ( bp_is_user_change_avatar() && 'crop-image' !== bp_get_avatar_admin_step() ) {
                 $retval = ! bp_core_get_root_option( 'bp-disable-avatar-uploads' );
         }

src/bp-xprofile/bp-xprofile-admin.php

@@ -690 +690 @@
          * @since BuddyPress (2.3.0)
          */
         public function enqueue_scripts( $screen_id ) {
-                if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' ) && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) ) || bp_core_get_root_option( 'bp-disable-avatar-uploads' ) || ! buddypress()->avatar->show_avatars ) {
+                if ( ( false === strpos( $screen_id, 'users_page_bp-profile-edit' ) 
+                        && false === strpos( $screen_id, 'profile_page_bp-profile-edit' ) ) 
+                        || bp_core_get_root_option( 'bp-disable-avatar-uploads' ) 
+                        || ! buddypress()->avatar->show_avatars
+                        || ! bp_attachments_is_wp_version_supported() ) {
                         return;
                 }
 
@@ -1069 +1073 @@
 
                         <?php endif;
 
-                        // Load the Avatar UI templates if user avatar uploads are enabled
-                        if ( ! bp_core_get_root_option( 'bp-disable-avatar-uploads' ) ) : ?>
+                        // Load the Avatar UI templates if user avatar uploads are enabled and current WordPress version is supported
+                        if ( ! bp_core_get_root_option( 'bp-disable-avatar-uploads' ) && bp_attachments_is_wp_version_supported() ) : ?>
                                 <a href="#TB_inline?width=800px&height=400px&inlineId=bp-xprofile-avatar-editor" title="<?php esc_attr_e( 'Edit Profile Photo', 'buddypress' );?>" class="thickbox bp-xprofile-avatar-user-edit"><?php esc_html_e( 'Edit Profile Photo', 'buddypress' ); ?></a>
                                 <div id="bp-xprofile-avatar-editor" style="display:none;">
                                         <?php bp_attachments_get_template_part( 'avatars/index' ); ?>