Ticket #20778: 207778-sw.diff

wp-includes/functions.php

@@ -1363 +1363 @@
 
 /**
  * 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/
+ * Function's preference is the return value of <code>sys_get_temp_dir()</code>, 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.
  *
@@ -1379 +1379 @@
         if ( $temp )
                 return trailingslashit($temp);
 
-        $temp = WP_CONTENT_DIR . '/';
-        if ( is_dir($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 = WP_CONTENT_DIR . '/';
+        if ( is_dir($temp) && @is_writable($temp) )
+                return $temp;
+
         $temp = ini_get('upload_tmp_dir');
         if ( is_dir($temp) && @is_writable($temp) )
                 return trailingslashit($temp);