Changeset 22008

Timestamp:

09/26/2012 05:02:58 AM (12 years ago)

Author:

dd32

Message:

Rearrange the order that we check for temporary directories in get_temp_dir(). This change causes us to use System temporary directories in preference to WP_CONTENT_DIR, for better windows compatibility, we use win_is_writable() as well. Props simonwheatley and kurtpayne for initial patches, See #20778

File:

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

trunk/wp-includes/functions.php

@@ -1368 +1368 @@
 /**
  * Determines a writable directory for temporary files.
- * Function's preference is to WP_CONTENT_DIR followed by the return value of <code>sys_get_temp_dir()</code>, before finally defaulting to /tmp/
- *
- * In the event that this function does not find a writable location, It may be overridden by the <code>WP_TEMP_DIR</code> constant in your <code>wp-config.php</code> file.
+ * Function's preference is the return value of <code>sys_get_temp_dir()</code>,
+ * followed by your PHP temporary upload directory, followed by WP_CONTENT_DIR,
+ * before finally defaulting to /tmp/
+ *
+ * In the event that this function does not find a writable location,
+ * It may be overridden by the <code>WP_TEMP_DIR</code> constant in
+ * your <code>wp-config.php</code> file.
  *
  * @since 2.5.0
@@ -1384 +1388 @@
         return trailingslashit($temp);
 
+    $is_win = ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) );
+
+    if ( function_exists('sys_get_temp_dir') ) {
+        $temp = sys_get_temp_dir();
+        if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) ) {
+            return trailingslashit( $temp );
+        }
+    }
+
+    $temp = ini_get('upload_tmp_dir');
+    if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) )
+        return trailingslashit($temp);
+
     $temp = WP_CONTENT_DIR . '/';
-    if ( is_dir($temp) && @is_writable($temp) )
+    if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) )
         return $temp;
-
-    if  ( function_exists('sys_get_temp_dir') ) {
-        $temp = sys_get_temp_dir();
-        if ( @is_writable($temp) )
-            return trailingslashit($temp);
-    }
-
-    $temp = ini_get('upload_tmp_dir');
-    if ( is_dir($temp) && @is_writable($temp) )
-        return trailingslashit($temp);
 
     $temp = '/tmp/';