Merge branch 'w23_MDL-39416_m26_pagelog' of git://github.com/skodak/m…

…oodle
themarkness · Jun 5, 2013 · 8c07c40 · 8c07c40
2 parents 796b57e + 102e0c7
commit 8c07c40
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -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;
     }