Merged from STABLE:

Stopgap measure for the wrong behavior discussed in SC#87.
I believe this ensures the required behavior, but we may still change
it because it can be confusing...

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index bc25135a0f92b5372ce1dc3386b353f1aac301e4..4668b4502693a26e574d9933dd5c5b108832eaf1 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -266,6 +266,7 @@ function clean_param($param, $options) {
         } else {
             $param =''; // not really ok
         }
+        $options ^= PARAM_URL; // Turn off the URL bit so that simple PARAM_URLs don't test true for PARAM_LOCALURL
     }
 
     if ($options & PARAM_LOCALURL) {