Merge branch 'w23_MDL-39416_m23_pagelog' of git://github.com/skodak/moodle into MOODLE_23_STABLE

2013-06-05 02:44:11 +02:00
parent 03cfbefbff a3ccd8e86e
commit f21e4e5b5f
1 changed files with 5 additions and 0 deletions
@@ -10343,6 +10343,11 @@ function get_performance_info() {
    $info['html'] .= '<span class="included">Included '.$info['includecount'].' files</span> ';
    $info['txt']  .= 'includecount: '.$info['includecount'].' ';

+    if (!empty($CFG->early_install_lang) or empty($PAGE)) {
+        // We can not track more performance before installation or before PAGE init, sorry.
+        return $info;
+    }
+
    $filtermanager = filter_manager::instance();
    if (method_exists($filtermanager, 'get_performance_summary')) {
        list($filterinfo, $nicenames) = $filtermanager->get_performance_summary();