Merge branch 'MDL-47806' of github.com:mr-russ/moodle

diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index d20a2a4..b146162 100644 (file)
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -3718,6 +3718,12 @@ class core_renderer_cli extends core_renderer {
         }
         return "!! $message !!\n";
     }
+
+    /**
+     * There is no footer for a cli request, however we must override the
+     * footer method to prevent the default footer.
+     */
+    public function footer() {}
 }
 
 

diff --git a/lib/tests/moodle_page_test.php b/lib/tests/moodle_page_test.php
index bf26317..8132ac0 100644 (file)
--- a/lib/tests/moodle_page_test.php
+++ b/lib/tests/moodle_page_test.php
@@ -647,6 +647,13 @@ class core_moodle_page_testcase extends advanced_testcase {
         $PAGE = $oldpage;
         $OUTPUT = $oldoutput;
     }
+
+    public function test_render_to_cli() {
+        global $OUTPUT;
+
+        $footer = $OUTPUT->footer();
+        $this->assertEmpty($footer, 'cli output does not have a footer.');
+    }
 }
 
 /**