Changeset 35267

Timestamp:

10/19/2015 12:52:08 AM (11 years ago)

Author:

dd32

Message:

In insert_with_markers() restore the 4.3 behaviour of creating the file if it doesn't exist.
This change also makes it bail early (without writing) if the markers content is the same as the existing, and uses ftell() rather than $bytes for the location to truncate the file to - based on the file pointer being at the end of the written stream.

Props willmot tigertech kevinatelement
See #31767

File:

• trunk/src/wp-admin/includes/misc.php (modified) (4 diffs)

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

@@ -97 +97 @@
  * @since 1.5.0
  *
- * @param string $filename
- * @param string $marker
- * @param array  $insertion
+ * @param string       $filename  Filename to alter.
+ * @param string       $marker    The marker to alter.
+ * @param array|string $insertion The new content to insert.
  * @return bool True on write success, false on failure.
  */
 function insert_with_markers( $filename, $marker, $insertion ) {
-        if ( ! is_writeable( $filename ) ) {
+        if ( ! file_exists( $filename ) ) {
+                if ( ! is_writable( dirname( $filename ) ) ) {
+                        return false;
+                }
+                if ( ! touch( $filename ) ) {
+                        return false;
+                }
+        } elseif ( ! is_writeable( $filename ) ) {
                 return false;
         }
 
         if ( ! is_array( $insertion ) ) {
-                $insertion = array( $insertion );
+                $insertion = explode( "\n", $insertion );
         }
 
@@ -128 +135 @@
 
         // Split out the existing file into the preceeding lines, and those that appear after the marker
-        $pre_lines = $post_lines = array();
+        $pre_lines = $post_lines = $existing_lines = array();
         $found_marker = $found_end_marker = false;
         foreach ( $lines as $line ) {
@@ -142 +149 @@
                 } elseif ( $found_marker && $found_end_marker ) {
                         $post_lines[] = $line;
-                }
+                } else {
+                        $existing_lines[] = $line;
+                }
+        }
+
+        // Check to see if there was a change
+        if ( $existing_lines === $insertion ) {
+                flock( $fp, LOCK_UN );
+                fclose( $fp );
+
+                return true;
         }
 
@@ -158 +175 @@
         $bytes = fwrite( $fp, $new_file_data );
         if ( $bytes ) {
-                ftruncate( $fp, $bytes );
-        }
-
+                ftruncate( $fp, ftell( $fp ) );
+        }
+        fflush( $fp );
         flock( $fp, LOCK_UN );
         fclose( $fp );