MDL-14956 DDL exceptions

This commit is contained in:
skodak
2008-06-22 16:51:55 +00:00
parent d90e0ef3d6
commit eee5d9bb85
21 changed files with 777 additions and 854 deletions
+4 -8
View File
@@ -1069,10 +1069,8 @@ function upgrade_blocks_db($continueto) {
}
/// Both old .sql files and new install.xml are supported
/// but we priorize install.xml (XMLDB) if present
$status = false;
if (file_exists($CFG->dirroot . '/blocks/db/install.xml')) {
$status = $DB->get_manager()->install_from_xmldb_file($CFG->dirroot . '/blocks/db/install.xml'); //New method
}
$DB->get_manager()->install_from_xmldb_file($CFG->dirroot . '/blocks/db/install.xml'); //New method
$status = true;
if (!defined('CLI_UPGRADE') || !CLI_UPGRADE ) {
$DB->set_debug(false);
}
@@ -1363,12 +1361,10 @@ function upgrade_blocks_plugins($continueto) {
/// Both old .sql files and new install.xml are supported
/// but we priorize install.xml (XMLDB) if present
$status = false;
if (file_exists($fullblock . '/db/install.xml')) {
$status = $DB->get_manager()->install_from_xmldb_file($fullblock . '/db/install.xml'); //New method
} else {
$status = true;
$DB->get_manager()->install_from_xmldb_file($fullblock . '/db/install.xml'); //New method
}
$status = true;
if (!defined('CLI_UPGRADE') || !CLI_UPGRADE ) {
$DB->set_debug(false);
}