Changeset 23254

Timestamp:

01/03/2013 07:56:38 AM (13 years ago)

Author:

dd32

Message:

Clarify the Documentation in win_is_writable() and move an inline comment to the Docblock, reduces confusion about what the function actually does. See #22900

File:

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

trunk/wp-includes/functions.php

@@ -1426 +1426 @@
  * Workaround for Windows bug in is_writable() function
  *
+ * PHP has issues with Windows ACL's for determine if a 
+ * directory is writable or not, this works around them by
+ * checking the ability to open files rather than relying
+ * upon PHP to interprate the OS ACL.
+ *
+ * @see http://bugs.php.net/bug.php?id=27609
+ * @see http://bugs.php.net/bug.php?id=30931
+ *
  * @since 2.8.0
  *
@@ -1432 +1440 @@
  */
 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
+
+    if ( $path[strlen( $path ) - 1] == '/' ) // if it looks like a directory, check a random file within the directory
         return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
-    else if ( is_dir( $path ) )
+    else if ( is_dir( $path ) ) // If it's a directory (and not a file) check a random file within the directory
         return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+
     // check tmp file for read/write capabilities
     $should_delete_tmp_file = !file_exists( $path );