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

This commit is contained in:
Eloy Lafuente (stronk7)
2013-06-05 02:43:48 +02:00
+2 -2
View File
@@ -10609,8 +10609,8 @@ 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)) {
// We can not track more performance before installation, sorry.
if (!empty($CFG->early_install_lang) or empty($PAGE)) {
// We can not track more performance before installation or before PAGE init, sorry.
return $info;
}