BUGFIX: Eescape / in RegExp.

silverstripe · Feb 27, 2012 · 2457c4f · 2457c4f
1 parent 8c075da
commit 2457c4f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/Convert.php b/core/Convert.php
@@ -308,7 +308,7 @@ static function html2raw($data, $preserveLinks = false, $wordWrap = 60, $config
 
 		$data = preg_replace("/<[Bb][Rr]([^A-Za-z0-9>][^>]*)?> */", "\n", $data);
 		$data = preg_replace("/<[Tt][Rr]([^A-Za-z0-9>][^>]*)?> */", "\n", $data);
-		$data = preg_replace("/</[Tt][Dd]([^A-Za-z0-9>][^>]*)?> */", "    ", $data);
+		$data = preg_replace("/<\/[Tt][Dd]([^A-Za-z0-9>][^>]*)?> */", "    ", $data);
 		$data = preg_replace('/<\/p>/i', "\n\n", $data );
 
 		// Replace HTML entities

diff --git a/filesystem/File.php b/filesystem/File.php
@@ -144,7 +144,7 @@ class File extends DataObject {
 	 */
 	static function find($filename) {
 		// Get the base file if $filename points to a resampled file
-		$filename = preg_replace('/_resampled/[^-]+-/', '', $filename);
+		$filename = preg_replace('/_resampled\/[^-]+-/', '', $filename);
 
 		// Split to folders and the actual filename, and traverse the structure.
 		$parts = explode("/", $filename);