Merge branch 'MDL-36710-master' of git://github.com/ankitagarwal/moodle

moodle · Nov 27, 2012 · 63e2347 · 63e2347
2 parents 9c8969a + c34e030
commit 63e2347
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/calendar/managesubscriptions_form.php b/calendar/managesubscriptions_form.php
@@ -122,8 +122,10 @@ public function validation($data, $files) {
                     $errors['importfile'] = get_string('errorrequiredurlorfile', 'calendar');
                 }
             }
-        } else if (($data['importfrom'] == CALENDAR_IMPORT_FROM_URL) && (clean_param($data['url'], PARAM_URL) !== $data['url'])) {
-            $errors['url']  = get_string('invalidurl', 'error');
+        } else if (($data['importfrom'] == CALENDAR_IMPORT_FROM_URL)) {
+            if (clean_param($data['url'], PARAM_URL) !== $data['url']) {
+                $errors['url']  = get_string('invalidurl', 'error');
+            }
         } else {
             // Shouldn't happen.
             $errors['url'] = get_string('errorrequiredurlorfile', 'calendar');