Changeset 9827

Timestamp:

04/30/2015 08:21:26 PM (9 years ago)

Author:

imath

Message:

Avatar UI : make sure the current site is using at least WordPress 3.9

To maximize browsers compatibility, the Avatar UI requires Pluload 2.1.1. This version of the script was introduced in version 3.9 of WordPress.
For WordPress versions 3.6 to 3.8, the legacy UI will be used.

Fixes #6290

Location:

trunk/src

Files:

• bp-core/bp-core-attachments.php (modified) (1 diff)
• bp-core/bp-core-avatars.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-admin.php (modified) (2 diffs)

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

@@ -9 +9 @@
 // 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', '>=' );
+}
 
 /**

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

@@ -1802 +1802 @@
     $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' );

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

@@ -691 +691 @@
      */
     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;
         }
@@ -1070 +1074 @@
             <?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;">