Changeset 29206 for trunk/src/wp-admin/includes/file.php

Timestamp:

07/17/2014 09:13:53 AM (11 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in wp-admin-directory files.

See #28931.

File:

• trunk/src/wp-admin/includes/file.php (modified) (7 diffs)

trunk/src/wp-admin/includes/file.php

@@ -180 +180 @@
             wp_die( __( 'Sorry, that file cannot be edited.' ) );
 
-        //case 2 :
-        //  wp_die( __('Sorry, can’t call files with their real path.' ));
+        // case 2 :
+        // wp_die( __('Sorry, can’t call files with their real path.' ));
 
         case 3 :
@@ -258 +258 @@
         __( "File upload stopped by extension." ));
 
-    // this may not have orignially been intended to be overrideable, but historically has been
+    /*
+     * This may not have orignially been intended to be overrideable,
+     * but historically has been.
+     */
     if ( isset( $overrides['upload_error_strings'] ) ) {
         $upload_error_strings = $overrides['upload_error_strings'];
@@ -268 +271 @@
     $test_upload = isset( $overrides['test_upload'] ) ? $overrides['test_upload'] : true;
 
-    // If you override this, you must provide $ext and $type!!!!
+    // If you override this, you must provide $ext and $type!!
     $test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
     $mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
@@ -315 +318 @@
     }
 
-    // A writable uploads dir will pass this test. Again, there's no point overriding this one.
+    /*
+     * A writable uploads dir will pass this test. Again, there's no point
+     * overriding this one.
+     */
     if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
         return call_user_func($upload_error_handler, $file, $uploads['error'] );
@@ -321 +327 @@
     $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
 
-    // Move the file to the uploads dir
+    // Move the file to the uploads dir.
     $new_file = $uploads['path'] . "/$filename";
     if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) {
@@ -332 +338 @@
     }
 
-    // Set correct file permissions
+    // Set correct file permissions.
     $stat = stat( dirname( $new_file ));
     $perms = $stat['mode'] & 0000666;
     @ chmod( $new_file, $perms );
 
-    // Compute the URL
+    // Compute the URL.
     $url = $uploads['url'] . "/$filename";
 
@@ -1052 +1058 @@
     $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
 
-    //sanitize the hostname, Some people might pass in odd-data:
+    // Sanitize the hostname, Some people might pass in odd-data:
     $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off