Changeset 10371

Timestamp:

11/21/2015 04:01:49 PM (10 years ago)

Author:

imath

Message:

Prevent notice errors in bp_attachments_uploads_dir_get() that are happening when wp_upload_dir() returns an error.

See #6729 (branch 2.4)

File:

• branches/2.4/src/bp-core/bp-core-attachments.php (modified) (4 diffs)

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

@@ -42 +42 @@
     } else {
         $upload_data = bp_upload_dir();
+
+        // Return empty string, if Uploads data are not available
+        if ( ! $upload_data ) {
+            return $retval;
+        }
 
         // Build the Upload data array for BuddyPress attachments
@@ -304 +309 @@
         $attachment_data = bp_attachments_uploads_dir_get();
 
+        // The BP Attachments Uploads Dir is not set, stop.
+        if ( ! $attachment_data ) {
+            return false;
+        }
+
         // Default to members for xProfile
         $object_subdir = 'members';
@@ -402 +412 @@
     // Get BuddyPress Attachments Uploads Dir datas
     $bp_attachments_uploads_dir = bp_attachments_uploads_dir_get();
+
+    // The BP Attachments Uploads Dir is not set, stop.
+    if ( ! $bp_attachments_uploads_dir ) {
+        return $attachment_data;
+    }
 
     $type_subdir = $r['object_dir'] . '/' . $r['item_id'] . '/' . $r['type'];
@@ -1235 +1250 @@
     $bp_attachments_uploads_dir = bp_attachments_uploads_dir_get();
 
+    // The BP Attachments Uploads Dir is not set, stop.
+    if ( ! $bp_attachments_uploads_dir ) {
+        bp_attachments_json_response( false, $is_html4, array(
+            'type'    => 'upload_error',
+            'message' => $error_message,
+        ) );
+    }
+
     $cover_subdir = $object_data['dir'] . '/' . $bp_params['item_id'] . '/cover-image';
     $cover_dir    = trailingslashit( $bp_attachments_uploads_dir['basedir'] ) . $cover_subdir;