L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-29474 fix regressions in CLI install

Browse Source
This commit is contained in:
Petr Skoda
2011-10-27 13:55:41 +02:00
parent 7b27861217
commit f433088d5a
3 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pluginlib.php
+18 -3
View File
@@ -851,7 +851,12 @@ abstract class plugintype_base {
static $pluginversions = null;
if (is_null($pluginversions) or $disablecache) {
$pluginversions = $DB->get_records_menu('config_plugins', array('name' => 'version'), 'plugin', 'plugin,value');
try {
$pluginversions = $DB->get_records_menu('config_plugins', array('name' => 'version'), 'plugin', 'plugin,value');
} catch (dml_exception $e) {
// before install
$pluginversions = array();
}
}
if (!array_key_exists($plugin, $pluginversions)) {
@@ -989,7 +994,12 @@ class plugintype_block extends plugintype_base implements plugin_information {
static $blocksinfocache = null;
if (is_null($blocksinfocache) or $disablecache) {
$blocksinfocache = $DB->get_records('block', null, 'name', 'name,id,version,visible');
try {
$blocksinfocache = $DB->get_records('block', null, 'name', 'name,id,version,visible');
} catch (dml_exception $e) {
// before install
$blocksinfocache = array();
}
}
return $blocksinfocache;
@@ -1318,7 +1328,12 @@ class plugintype_mod extends plugintype_base implements plugin_information {
static $modulesinfocache = null;
if (is_null($modulesinfocache) or $disablecache) {
$modulesinfocache = $DB->get_records('modules', null, 'name', 'name,id,version,visible');
try {
$modulesinfocache = $DB->get_records('modules', null, 'name', 'name,id,version,visible');
} catch (dml_exception $e) {
// before install
$modulesinfocache = array();
}
}
return $modulesinfocache;