NOMDL MNet: improved trailing slashes removal

Double slashes and eventual whitespace after trailing slash are now removed, too.
moodle · Jul 12, 2010 · d55b0e6 · d55b0e6
1 parent e7c1d02
commit d55b0e6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/admin/mnet/peers.php b/admin/mnet/peers.php
@@ -77,7 +77,8 @@
 // if the first form has been submitted, bootstrap the peer and load up the review form
 if ($formdata = $simpleform->get_data()) {
     // ensure we remove trailing slashes
-    $formdata->wwwroot = preg_replace(':/$:', '', $formdata->wwwroot);
+    $formdata->wwwroot = trim($formdata->wwwroot);
+    $formdata->wwwroot = rtrim($formdata->wwwroot, '/');
 
     // ensure the wwwroot starts with a http or https prefix
     if (strtolower(substr($formdata->wwwroot, 0, 4)) != 'http') {