MDL-58386 core: Fixed CI issues

Part of MDL-55611 epic.
This commit is contained in:
Jun Pataleta 2017-03-24 16:57:58 +08:00 committed by Dan Poltawski
parent 775c6bac6d
commit 966cbed632
3 changed files with 7 additions and 5 deletions

View File

@ -6676,8 +6676,10 @@ function calendar_get_module_cached(&$coursecache, $modulename, $instance) {
// so the old implementation must remain here.
$module = get_coursemodule_from_instance($modulename, $instance);
if($module === false) return false;
if(!calendar_get_course_cached($coursecache, $module->course)) {
if ($module === false) {
return false;
}
if (!calendar_get_course_cached($coursecache, $module->course)) {
return false;
}
return $module;

View File

@ -544,7 +544,7 @@ function enrol_add_course_navigation(navigation_node $coursenode, $course) {
* @param array $courseids the list of course ids to filter by
* @return array
*/
function enrol_get_my_courses($fields = NULL, $sort = 'visible DESC,sortorder ASC',
function enrol_get_my_courses($fields = null, $sort = 'visible DESC,sortorder ASC',
$limit = 0, $courseids = []) {
global $DB, $USER;

View File

@ -579,7 +579,7 @@ class behat_navigation extends behat_base {
*
* @Given /^I am on "(?P<coursefullname_string>(?:[^"]|\\")*)" course homepage$/
* @throws coding_exception
* @param $coursefullname string The full name of the course.
* @param string $coursefullname The full name of the course.
* @return void
*/
public function i_am_on_course_homepage($coursefullname) {
@ -594,7 +594,7 @@ class behat_navigation extends behat_base {
*
* @Given /^I am on "(?P<coursefullname_string>(?:[^"]|\\")*)" course homepage with editing mode on$/
* @throws coding_exception
* @param $coursefullname string The course full name of the course.
* @param string $coursefullname The course full name of the course.
* @return void
*/
public function i_am_on_course_homepage_with_editing_mode_on($coursefullname) {