Changeset 3856

Timestamp:

06/08/2006 03:21:04 AM (18 years ago)

Author:

ryan

Message:

Make replacement strings backref safe without using \${1} so as to preserve php <= 4.2 compatible. Props mdawaffe. fixes #2774

Location:

branches/2.0/wp-includes

Files:

• functions-formatting.php (modified) (1 diff)
• functions.php (modified) (2 diffs)

branches/2.0/wp-includes/functions-formatting.php

@@ -518 +518 @@
 function zeroise($number,$threshold) { // function to add leading zeros when necessary
     return sprintf('%0'.$threshold.'s', $number);
-    }
+}
 
 
 function backslashit($string) {
+    $string = preg_replace('/^([0-9])/', '\\\\\\\\\1', $string);
     $string = preg_replace('/([a-z])/i', '\\\\\1', $string);
     return $string;

branches/2.0/wp-includes/functions.php

@@ -33 +33 @@
         $dateweekday_abbrev = $weekday_abbrev[$dateweekday];
         $dateformatstring = ' '.$dateformatstring;
-        $dateformatstring = preg_replace("/([^\\\])D/", "\${1}".backslashit($dateweekday_abbrev), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])F/", "\${1}".backslashit($datemonth), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])l/", "\${1}".backslashit($dateweekday), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])M/", "\${1}".backslashit($datemonth_abbrev), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
 
         $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
@@ -72 +72 @@
         $dateweekday_abbrev = $weekday_abbrev[$dateweekday];
         $dateformatstring = ' '.$dateformatstring;
-        $dateformatstring = preg_replace("/([^\\\])D/", "\${1}".backslashit($dateweekday_abbrev), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])F/", "\${1}".backslashit($datemonth), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])l/", "\${1}".backslashit($dateweekday), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])M/", "\${1}".backslashit($datemonth_abbrev), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
         $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
     }