Changeset 23255

Timestamp:

01/03/2013 08:04:11 AM (12 years ago)

Author:

dd32

Message:

HTTP API: Introduce wp_is_writable() to wrap win_is_writable() and is_writable() to work around PHP Windows ACL issues. See #22900 for trunk

Location:

trunk/wp-includes

Files:

• class-http.php (modified) (1 diff)
• functions.php (modified) (1 diff)

trunk/wp-includes/class-http.php

@@ -142 +142 @@
         if ( $r['stream'] ) {
             $r['blocking'] = true;
-            if ( ! is_writable( dirname( $r['filename'] ) ) )
+            if ( ! wp_is_writable( dirname( $r['filename'] ) ) )
                 return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
         }

trunk/wp-includes/functions.php

@@ -1402 +1402 @@
         return trailingslashit( rtrim( $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 ) ) ) {
+        if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
             return trailingslashit( rtrim( $temp, '\\' ) );
-        }
     }
 
     $temp = ini_get('upload_tmp_dir');
-    if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) )
+    if ( is_dir( $temp ) && wp_is_writable( $temp ) )
         return trailingslashit( rtrim( $temp, '\\' ) );
 
     $temp = WP_CONTENT_DIR . '/';
-    if ( is_dir( $temp ) && ( $is_win ? win_is_writable( $temp ) : @is_writable( $temp ) ) )
+    if ( is_dir( $temp ) && wp_is_writable( $temp ) )
         return $temp;
 
     $temp = '/tmp/';
     return $temp;
+}
+
+/**
+ * Determine if a directory is writable.
+ *
+ * This function is used to work around certain ACL issues 
+ * in PHP primarily affecting Windows Servers.
+ *
+ * @see win_is_writable()
+ *
+ * @since 3.6.0
+ *
+ * @param string $path
+ * @return bool
+ */
+function wp_is_writable( $path ) {
+    if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
+        return win_is_writable( $path );
+    else
+        return @is_writable( $path );
 }