Changeset 22009

Timestamp:

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

Author:

dd32

Message:

Move win_is_writable() from wp-admin/includes to wp-includes so that it's always available for get_temp_dir(). Fixes #20778

Location:

trunk

Files:

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

trunk/wp-admin/includes/misc.php

@@ -525 +525 @@
 
 /**
- * Workaround for Windows bug in is_writable() function
- *
- * @since 2.8.0
- *
- * @param string $path
- * @return bool
- */
-function win_is_writable( $path ) {
-    /* will work in despite of Windows ACLs bug
-     * NOTE: use a trailing slash for folders!!!
-     * see http://bugs.php.net/bug.php?id=27609
-     * see http://bugs.php.net/bug.php?id=30931
-     */
-
-    if ( $path[strlen( $path ) - 1] == '/' ) // recursively return a temporary file path
-        return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
-    else if ( is_dir( $path ) )
-        return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
-    // check tmp file for read/write capabilities
-    $should_delete_tmp_file = !file_exists( $path );
-    $f = @fopen( $path, 'a' );
-    if ( $f === false )
-        return false;
-    fclose( $f );
-    if ( $should_delete_tmp_file )
-        unlink( $path );
-    return true;
-}
-
-/**
  * Display the default admin color scheme picker (Used in user-edit.php)
  *

trunk/wp-includes/functions.php

@@ -1407 +1407 @@
     $temp = '/tmp/';
     return $temp;
+}
+
+/**
+ * Workaround for Windows bug in is_writable() function
+ *
+ * @since 2.8.0
+ *
+ * @param string $path
+ * @return bool
+ */
+function win_is_writable( $path ) {
+    /* will work in despite of Windows ACLs bug
+     * NOTE: use a trailing slash for folders!!!
+     * see http://bugs.php.net/bug.php?id=27609
+     * see http://bugs.php.net/bug.php?id=30931
+     */
+
+    if ( $path[strlen( $path ) - 1] == '/' ) // recursively return a temporary file path
+        return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
+    else if ( is_dir( $path ) )
+        return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+    // check tmp file for read/write capabilities
+    $should_delete_tmp_file = !file_exists( $path );
+    $f = @fopen( $path, 'a' );
+    if ( $f === false )
+        return false;
+    fclose( $f );
+    if ( $should_delete_tmp_file )
+        unlink( $path );
+    return true;
 }