From: Andrew Davis <andrew@affinitysoftware.net>
Date: Wed, 18 Nov 2009 07:29:26 +0000 (+0000)
Subject: all MDL-20821 Removed more deprecated functions
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=fcfbd1175504fc5045ba354115afa21aecb9dc7a;p=moodle.git

all MDL-20821 Removed more deprecated functions
---

diff --git a/lib/validateurlsyntax.php b/lib/validateurlsyntax.php
index f39efdfc73..aa9c24a37d 100755
--- a/lib/validateurlsyntax.php
+++ b/lib/validateurlsyntax.php
@@ -305,17 +305,17 @@ function validateUrlSyntax( $urladdr, $options="" ){
     $querystring       = '(\?(' . $reserved . '|' . $unreserved . '|' . $escaped . ')*)' . $aOptions['q'];
 
                        // Fragment Section - Accepts anchors such as #top
-    $fragment          = '(#(' . $reserved . '|' . $unreserved . '|' . $escaped . ')*)' . $aOptions['r'];
+    $fragment          = '(\#(' . $reserved . '|' . $unreserved . '|' . $escaped . ')*)' . $aOptions['r'];
 
 
     // Building Regular Expression
-    $regexp = '^' . $scheme . $userinfo . $address . $port_number . $path . $querystring . $fragment . '$';
+    $regexp = '#^' . $scheme . $userinfo . $address . $port_number . $path . $querystring . $fragment . '$#i';
 
     // DEBUGGING - Uncomment Line Below To Display The Regular Expression Built
     // echo '<pre>' . htmlentities(wordwrap($regexp,70,"\n",1)) . '</pre>';
 
     // Running the regular expression
-    if (preg_match( preg_quote($regexp,'/'), $urladdr ))
+    if (preg_match( $regexp, $urladdr ))
     {
         return true; // The domain passed
     }