From 53bc0a28dc6766010f35154fc9e856fb8bdc9de5 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Tue, 13 Jan 2009 03:27:41 +0000 Subject: [PATCH] BUGFIX Deleted setting of $content variable that broke HTTP::findByTagAndAttribute() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@70052 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/HTTP.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/HTTP.php b/core/HTTP.php index 7e9f06caa..1ffc715ab 100644 --- a/core/HTTP.php +++ b/core/HTTP.php @@ -102,12 +102,10 @@ class HTTP { static function findByTagAndAttribute($content, $attribs) { $regExps = array(); - $content = ''; foreach($attribs as $tag => $attrib) { - if(!is_numeric($tag)) $tagPrefix = "$tag "; - else $tagPrefix = ""; - + $tagPrefix = (is_numeric($tag)) ? '' : "$tag "; + $regExps[] = "/(<{$tagPrefix}[^>]*$attrib *= *\")([^\"]*)(\")/ie"; $regExps[] = "/(<{$tagPrefix}[^>]*$attrib *= *')([^']*)(')/ie"; $regExps[] = "/(<{$tagPrefix}[^>]*$attrib *= *)([^\"' ]*)( )/ie"; @@ -125,6 +123,7 @@ class HTTP { static function getLinksIn($content) { return self::findByTagAndAttribute($content, array("a" => "href")); } + static function getImagesIn($content) { return self::findByTagAndAttribute($content, array("img" => "src")); }