Changeset 22736

Timestamp:

11/21/2012 07:08:38 AM (12 years ago)

Author:

markjaquith

Message:

Remove trailing slashes from UPLOADS before trying a str_replace() in wp_upload_dir(). props jbrinley. fixes #22469

• In 3.4.x, both $url and UPLOADS had trailing slashes
• Due to refactoring, $url is no longer expected to have a trailing slash
• Because of the mismatch, the str_replace() was not working, resulting in an incorrectly verbose upload dir URL

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1541 +1541 @@
             if ( defined( 'BLOGUPLOADDIR' ) )
                 $dir = untrailingslashit( BLOGUPLOADDIR );
-            $url = str_replace( UPLOADS, 'files', $url );
+            $url = str_replace( untrailingslashit( UPLOADS ), 'files', $url );
         }
     }