From: stronk7 <stronk7>
Date: Thu, 28 May 2009 14:45:04 +0000 (+0000)
Subject: MDL-19229 backup regexp - some servers seem to require the /u modifier if unicode... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=47ff1b64ed81daf444fe78b8c2e222d61c0b7893;p=moodle.git

MDL-19229 backup regexp - some servers seem to require the /u modifier if unicode classes are used (sadly Macs don't). Merged from 19_STABLE
---

diff --git a/backup/backuplib.php b/backup/backuplib.php
index e3aa6202c7..97a79ad62c 100644
--- a/backup/backuplib.php
+++ b/backup/backuplib.php
@@ -2370,7 +2370,7 @@
         // This way, backup contents will be neutral and independent of slasharguments configuration. MDL-18799
         // Based in $unicoderegexp, decide the regular expression to use
         if ($unicoderegexp) { //We can use unicode modifiers
-            $search = '/(\$@FILEPHP@\$)((?:(?:\/|%2f|%2F))(?:(?:\([-;:@#&=\pL0-9\$~_.+!*\',]*?\))|[-;:@#&=\pL0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*)?(\?(?:(?:(?:\([-;:@#&=\pL0-9\$~_.+!*\',]*?\))|[-;:@#&=?\pL0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*))?(?<![,.;])/';
+            $search = '/(\$@FILEPHP@\$)((?:(?:\/|%2f|%2F))(?:(?:\([-;:@#&=\pL0-9\$~_.+!*\',]*?\))|[-;:@#&=\pL0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*)?(\?(?:(?:(?:\([-;:@#&=\pL0-9\$~_.+!*\',]*?\))|[-;:@#&=?\pL0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*))?(?<![,.;])/u';
         } else { //We cannot ue unicode modifiers
             $search = '/(\$@FILEPHP@\$)((?:(?:\/|%2f|%2F))(?:(?:\([-;:@#&=a-zA-Z0-9\$~_.+!*\',]*?\))|[-;:@#&=a-zA-Z0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*)?(\?(?:(?:(?:\([-;:@#&=a-zA-Z0-9\$~_.+!*\',]*?\))|[-;:@#&=?a-zA-Z0-9\$~_.+!*\',]|%[a-fA-F0-9]{2}|\/)*))?(?<![,.;])/';
         }