Merge branch 'MDL-59713-master-2' of git://github.com/ryanwyllie/moodle

diff --cc calendar/classes/local/event/forms/create.php
index a79e3dc,4a4172d..e6c025f
--- 1/calendar/classes/local/event/forms/create.php
--- 2/calendar/classes/local/event/forms/create.php
+++ b/calendar/classes/local/event/forms/create.php
@@@ -42,12 -42,9 +42,13 @@@ class create extends \moodleform 
  
          $mform = $this->_form;
          $haserror = !empty($this->_customdata['haserror']);
+         $starttime = isset($this->_customdata['starttime']) ? $this->_customdata['starttime'] : 0;
          $eventtypes = calendar_get_all_allowed_types();
  
 +        if (empty($eventtypes)) {
 +            print_error('nopermissiontoupdatecalendar');
 +        }
 +
          $mform->setDisableShortforms();
          $mform->disable_form_change_checker();
  

diff --cc theme/bootstrapbase/less/moodle/calendar.less
Simple merge

diff --cc theme/bootstrapbase/style/moodle.css
Simple merge