Merge branch 'wip-mdl-36352' of git://github.com/rajeshtaneja/moodle

diff --cc calendar/managesubscriptions_form.php
index fcd7979,c08f984..731bbd3
--- 1/calendar/managesubscriptions_form.php
--- 2/calendar/managesubscriptions_form.php
+++ b/calendar/managesubscriptions_form.php
@@@ -58,15 -58,8 +58,9 @@@ class calendar_addsubscription_form ext
  
          // URL.
          $mform->addElement('text', 'url', get_string('importfromurl', 'calendar'), array('maxsize' => '255', 'size' => '50'));
 -        $mform->setType('url', PARAM_URL);
 +        // Cannot set as PARAM_URL since we need to allow webcal:// protocol.
 +        $mform->setType('url', PARAM_RAW);
  
-         // Import file
-         $mform->addElement('filepicker', 'importfile', get_string('importfromfile', 'calendar'));
- 
-         $mform->disabledIf('url',  'importfrom', 'eq', CALENDAR_IMPORT_FROM_FILE);
-         $mform->disabledIf('importfile', 'importfrom', 'eq', CALENDAR_IMPORT_FROM_URL);
- 
          // Poll interval
          $choices = calendar_get_pollinterval_choices();
          $mform->addElement('select', 'pollinterval', get_string('pollinterval', 'calendar'), $choices);