MDL-19840 Fixed a bug in regex delimiter quoting

diff --git a/lib/simpletest/testsimpletestlib.php b/lib/simpletest/testsimpletestlib.php
index be95ac60f674f28be0812ce2fbc973b26c63f83b..1f775e28b76a44e115fe62e5a8083747cb3709bc 100644 (file)
--- a/lib/simpletest/testsimpletestlib.php
+++ b/lib/simpletest/testsimpletestlib.php
@@ -52,6 +52,11 @@ class ContainsTagWithAttribute_test extends UnitTestCase {
         $expectation = new ContainsTagWithAttribute('span', 'class', 'error');
         $this->assertFalse($expectation->test('<span class="mismatch">message</span>'));
     }
+
+    function test_link() {
+        $expectation = new ContainsTagWithAttribute('a', 'href', 'http://www.test.com');
+        $this->assertTrue($expectation->test('<a href="http://www.test.com">Click Here</a>'));
+    }
 }
 
 /**

diff --git a/lib/simpletestlib.php b/lib/simpletestlib.php
index feb674cfef40954007e17d813e1dada8a6e91ad5..af83fb9b5ecab46329125aab7f8b655416d2f127 100644 (file)
--- a/lib/simpletestlib.php
+++ b/lib/simpletestlib.php
@@ -209,8 +209,8 @@ class ContainsTagWithAttribute extends SimpleExpectation {
     }
 
     function test($html) {
-        $regex = '/<' . preg_quote($this->tag) . self::ATTRSREGEX .
-                '(?:\s+' . preg_quote($this->attribute) . '\s*=\s*["\']' . preg_quote($this->value) . '["\'])' .
+        $regex = '/<' . preg_quote($this->tag, '/') . self::ATTRSREGEX .
+                '(?:\s+' . preg_quote($this->attribute, '/') . '\s*=\s*["\']' . preg_quote($this->value, '/') . '["\'])' .
                 self::ATTRSREGEX . '\s*>/';
         return preg_match($regex, $html);
     }
@@ -241,8 +241,8 @@ class ContainsTagWithContents extends SimpleExpectation {
     }
 
     function test($html) {
-        $regex = '/<' . preg_quote($this->tag) . self::ATTRSREGEX . '\s*>' . preg_quote($this->content) .
-                '<\/' . preg_quote($this->tag) . '>/';
+        $regex = '/<' . preg_quote($this->tag, '/') . self::ATTRSREGEX . '\s*>' . preg_quote($this->content, '/') .
+                '<\/' . preg_quote($this->tag, '/') . '>/';
         return preg_match($regex, $html);
     }