Merge branch 'w51_MDL-35893_m25_perfinstall' of git://github.com/skod…

…ak/moodle
alseambusher · Jan 8, 2013 · c4c1504 · c4c1504
2 parents 0ab681d + bc5d899
commit c4c1504
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -10390,6 +10390,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)) {
+        // We can not track more performance before installation, sorry.
+        return $info;
+    }
+
     $filtermanager = filter_manager::instance();
     if (method_exists($filtermanager, 'get_performance_summary')) {
         list($filterinfo, $nicenames) = $filtermanager->get_performance_summary();