Changeset 2797 for trunk/wp-admin/admin-functions.php

Timestamp:

08/20/2005 01:56:27 AM (21 years ago)

Author:

ryan

Message:

Improved insert_with_markers(). Props Eric Anderson. fixes #1417

File:

• trunk/wp-admin/admin-functions.php (modified) (4 diffs)

trunk/wp-admin/admin-functions.php

@@ -798 +798 @@
 }
 
-// insert_with_markers: Owen Winkler
+// insert_with_markers: Owen Winkler, fixed by Eric Anderson
 // Inserts an array of strings into a file (.htaccess), placing it between
 // BEGIN and END markers.  Replaces existing marked info.  Retains surrounding
@@ -815 +815 @@
         if ($markerdata) {
             $state = true;
-            $newline = '';
             foreach($markerdata as $markerline) {
-                if (strstr($markerline, "# BEGIN {$marker}")) $state = false;
-                if ($state) fwrite($f, "{$newline}{$markerline}");
-                if (strstr($markerline, "# END {$marker}")) {
-                    fwrite($f, "{$newline}# BEGIN {$marker}");
-                    if(is_array($insertion)) foreach($insertion as $insertline) fwrite($f, "{$newline}{$insertline}");
-                    fwrite($f, "{$newline}# END {$marker}");
+                if (strstr($markerline, "# BEGIN {$marker}\n")) $state = false;
+                if ($state) fwrite($f, "{$markerline}\n");
+                if (strstr($markerline, "# END {$marker}\n")) {
+                    fwrite($f, "# BEGIN {$marker}\n");
+                    if(is_array($insertion)) foreach($insertion as $insertline) fwrite($f, "{$insertline}\n");
+                    fwrite($f, "# END {$marker}\n");
                     $state = true;
                     $foundit = true;
                 }
-                $newline = "\n";
             }
         }
@@ -832 +830 @@
             fwrite($f, "# BEGIN {$marker}\n");
             foreach($insertion as $insertline) fwrite($f, "{$insertline}\n");
-            fwrite($f, "# END {$marker}");              
+            fwrite($f, "# END {$marker}\n");
         }
         fclose($f);
@@ -841 +839 @@
 }
 
-// insert_with_markers: Owen Winkler
+// extract_from_markers: Owen Winkler
 // Returns an array of strings from a file (.htaccess) from between BEGIN
 // and END markers.