Merge branch 'MDL-73734-streaming-output-api' of https://github.com/brendanheywood/moodle

lib/classes/shutdown_manager.php

@@ -195,7 +195,7 @@ class core_shutdown_manager {
      * Standard shutdown sequence.
      */
     protected static function request_shutdown() {
-        global $CFG;
+        global $CFG, $OUTPUT;
 
         // Help apache server if possible.
         $apachereleasemem = false;
@@ -216,6 +216,15 @@ class core_shutdown_manager {
                 $perf = get_performance_info();
                 error_log("PERF: " . $perf['txt']);
             }
+            if (MDL_PERFTOFOOT || debugging() || (!empty($CFG->perfdebug) && $CFG->perfdebug > 7)) {
+                if (NO_OUTPUT_BUFFERING) {
+                    // If the performance footer was deferred then print it now.
+                    if (!CLI_SCRIPT && !WS_SERVER) {
+                        $perf = get_performance_info();
+                        echo $OUTPUT->select_element_for_replace('#perfdebugfooter', $perf['html']);
+                    }
+                }
+            }
             if (MDL_PERFINC) {
                 $inc = get_included_files();
                 $ts  = 0;