Changeset 13541

Timestamp:

08/03/2023 05:23:18 AM (2 years ago)

Author:

imath

Message:

Improve the function to get the Avatar uploads path and url

Update the bp_core_get_upload_dir() function so that it rightly uses the bp_upload_dir() one. The latter is returning false when an error occured while WordPress tried to set the site's uploads directory instead of an array containing an error key.

Props fawp

Fixes #8966
Closes ​https://github.com/buddypress/buddypress/pull/147

File:

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

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

@@ -1624 +1624 @@
  */
 function bp_core_get_upload_dir( $type = 'upload_path' ) {
-    $bp = buddypress();
+    $bp     = buddypress();
+    $retval = '';
 
     switch ( $type ) {
@@ -1640 +1641 @@
 
         default :
-            return false;
+            return $retval;
 
             break;
@@ -1668 +1669 @@
             }
 
-            // Directory does not exist and cannot be created.
-            if ( ! empty( $upload_dir['error'] ) ) {
-                $retval = '';
-
-            } else {
-                $retval = $upload_dir[$key];
+            // Upload directory exists.
+            if ( isset( $upload_dir[ $key ] ) ) {
+                $retval = $upload_dir[ $key ];
 
                 // If $key is 'baseurl', check to see if we're on SSL
                 // Workaround for WP13941, WP15928, WP19037.
-                if ( $key == 'baseurl' && is_ssl() ) {
+                if ( $key === 'baseurl' && is_ssl() ) {
                     $retval = str_replace( 'http://', 'https://', $retval );
                 }
             }
-
         }