Changeset 22331

Timestamp:

10/30/2012 08:58:35 PM (12 years ago)

Author:

dd32

Message:

Prevent an issue on windows systems which can cause the temporary directory from get_temp_dir() from returning a path containing \/. Props to SergeyBiryukov for the initial patch. Fixes #20778

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -1400 +1400 @@
 
     if ( $temp )
-        return trailingslashit($temp);
+        return trailingslashit( rtrim( $temp, '\\' ) );
 
     $is_win = ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) );
@@ -1407 +1407 @@
         $temp = sys_get_temp_dir();
         if ( @is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) ) {
-            return trailingslashit( $temp );
+            return trailingslashit( rtrim( $temp, '\\' ) );
         }
     }
@@ -1413 +1413 @@
     $temp = ini_get('upload_tmp_dir');
     if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) )
-        return trailingslashit($temp);
+        return trailingslashit( rtrim( $temp, '\\' ) );
 
     $temp = WP_CONTENT_DIR . '/';