MDL-17458 fixing installation regressions - no output and timeout

This commit is contained in:
skodak
2009-06-07 08:46:13 +00:00
parent fd027f509d
commit c3d0e1492e
2 changed files with 2 additions and 0 deletions
+1
View File
@@ -40,6 +40,7 @@ if (version_compare(phpversion(), '5.2.0') < 0) {
// try to flush everything all the time
@ob_implicit_flush(true);
while(@ob_end_clean()); // ob_end_flush prevents sending of headers
require('../config.php');
require_once($CFG->libdir.'/adminlib.php'); // various admin-only functions
+1
View File
@@ -1024,6 +1024,7 @@ function install_core($version, $verbose) {
global $CFG, $DB;
try {
set_time_limit(600);
print_upgrade_part_start('moodle', true, $verbose); // does not store upgrade running flag
$DB->get_manager()->install_from_xmldb_file("$CFG->libdir/db/install.xml");