From: defacer <defacer>
Date: Sun, 30 Jan 2005 04:39:55 +0000 (+0000)
Subject: Merged from STABLE:
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=31686aea4cd7a73819a88244468373e64e85813f;p=moodle.git

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 bc25135a0f..4668b45026 100644
--- 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) {