diff --git a/classes/local/controllers/infopage.php b/classes/local/controllers/infopage.php index 68366f1..bc91d97 100644 --- a/classes/local/controllers/infopage.php +++ b/classes/local/controllers/infopage.php @@ -220,7 +220,11 @@ class infopage { echo $OUTPUT->header(); require($CFG->dirroot.'/auth/outage/views/info/content.php'); - echo $OUTPUT->footer(); + + // Moodle 2.7 did not check for CLI mode, which was fixed later. + if (!($CFG->branch == '27' && CLI_SCRIPT)) { + echo $OUTPUT->footer(); + } } } diff --git a/tests/behat/behat_auth_outage.php b/tests/behat/behat_auth_outage.php index 0a0fc86..855cd09 100644 --- a/tests/behat/behat_auth_outage.php +++ b/tests/behat/behat_auth_outage.php @@ -126,8 +126,8 @@ class behat_auth_outage extends behat_base { $expected = ($action == 'Edit') ? 2 : 1; // Edit is an action through the title or button. $found = $this->can_i_see_action($action); if ($found != $expected) { - throw new ExpectationException('"'.$action.'" action not found, expected '.$expected - .' but found '.$found.'.', $this->getSession()); + throw new ExpectationException('"'.$action.'" action not found, expected '.$expected. + ' but found '.$found.'.', $this->getSession()); } } diff --git a/tests/phpunit/local/controllers/infopage_test.php b/tests/phpunit/local/controllers/infopage_test.php index cc4527d..aa4cca4 100644 --- a/tests/phpunit/local/controllers/infopage_test.php +++ b/tests/phpunit/local/controllers/infopage_test.php @@ -92,7 +92,7 @@ class infopagecontroller_test extends advanced_testcase { $html = $info->get_output(); // Must find... self::assertContains('', $html); - self::assertContains('', $html); // Issue #53. self::assertContains('', $html); self::assertContains($outage->get_title(), $html); self::assertContains($outage->get_description(), $html); diff --git a/views/info/static.php b/views/info/static.php index dfdcfce..3b29898 100644 --- a/views/info/static.php +++ b/views/info/static.php @@ -35,7 +35,7 @@ global $SITE; <?php echo strip_tags($SITE->fullname); ?> - +