Changeset 9625

Timestamp:

03/17/2015 06:42:02 PM (11 years ago)

Author:

imath

Message:

Do some clean up in avatar uploads directory filters

Let WordPress creates the uploads directory for us.

Props johnjamesjacoby

See #6278

Location:

trunk/src

Files:

• bp-groups/bp-groups-functions.php (modified) (2 diffs)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-xprofile/bp-xprofile-functions.php (modified) (1 diff)

trunk/src/bp-groups/bp-groups-functions.php

@@ -818 +818 @@
         }
 
-        $path    = bp_core_avatar_upload_path() . '/group-avatars/' . $group_id;
-        $newbdir = $path;
-
-        if ( !file_exists( $path ) )
-                @wp_mkdir_p( $path );
-
-        $newurl    = bp_core_avatar_url() . '/group-avatars/' . $group_id;
+        $directory = 'group-avatars';
+        $path      = bp_core_avatar_upload_path() . '/' . $directory . '/' . $group_id;
+        $newbdir   = $path;
+        $newurl    = bp_core_avatar_url() . '/' . $directory . '/' . $group_id;
         $newburl   = $newurl;
-        $newsubdir = '/group-avatars/' . $group_id;
+        $newsubdir = '/' . $directory . '/' . $group_id;
 
         /**
@@ -835 +832 @@
          * @param array $value Array of parts related to the groups avatar upload directory.
          */
-        return apply_filters( 'groups_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
+        return apply_filters( 'groups_avatar_upload_dir', array(
+                'path'    => $path,
+                'url'     => $newurl,
+                'subdir'  => $newsubdir,
+                'basedir' => $newbdir,
+                'baseurl' => $newburl,
+                'error'   => false
+        ) );
 }
 

trunk/src/bp-members/bp-members-functions.php

@@ -2160 +2160 @@
         }
 
-        $path  = bp_core_avatar_upload_path() . '/avatars/signups/' . $bp->signup->avatar_dir;
-        $newbdir = $path;
-
-        if ( ! file_exists( $path ) ) {
-                @wp_mkdir_p( $path );
-        }
-
-        $newurl = bp_core_avatar_url() . '/avatars/signups/' . $bp->signup->avatar_dir;
-        $newburl = $newurl;
-        $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
+        $directory = 'avatars/signups';
+        $path      = bp_core_avatar_upload_path() . '/' . $directory . '/' . $bp->signup->avatar_dir;
+        $newbdir   = $path;
+        $newurl    = bp_core_avatar_url() . '/' . $directory . '/' . $bp->signup->avatar_dir;
+        $newburl   = $newurl;
+        $newsubdir = '/' . $directory . '/' . $bp->signup->avatar_dir;
 
         /**
@@ -2184 +2180 @@
                 'basedir' => $newbdir,
                 'baseurl' => $newburl,
-                'error' => false
+                'error'   => false
         ) );
 }

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

@@ -681 +681 @@
         }
 
-        $path    = bp_core_avatar_upload_path() . '/' . $directory. '/' . $user_id;
-        $newbdir = $path;
-
-        if ( ! file_exists( $path ) ) {
-                @wp_mkdir_p( $path );
-        }
-
+        $path      = bp_core_avatar_upload_path() . '/' . $directory. '/' . $user_id;
+        $newbdir   = $path;
         $newurl    = bp_core_avatar_url() . '/' . $directory. '/' . $user_id;
         $newburl   = $newurl;