diff options
| -rw-r--r-- | config-db/OpenSLX/DBSchema.pm | 11 | ||||
| -rw-r--r-- | config-db/OpenSLX/MetaDB/DBI.pm | 6 |
2 files changed, 13 insertions, 4 deletions
diff --git a/config-db/OpenSLX/DBSchema.pm b/config-db/OpenSLX/DBSchema.pm index 5d7ca786..63774dfb 100644 --- a/config-db/OpenSLX/DBSchema.pm +++ b/config-db/OpenSLX/DBSchema.pm @@ -35,7 +35,7 @@ use OpenSLX::Basics; ### fk => foreign key (integer) ################################################################################ -my $VERSION = 0.27; +my $VERSION = 0.28; my $DbSchema = { 'version' => $VERSION, @@ -682,6 +682,15 @@ sub _schemaUpgradeDBFrom name => '<<<default>>>', comment => 'holds default plugins for all vendor-OS', }]); + + return 1; + }, + 0.28 => sub { + my $metaDB = shift; + + # correct effects of implementation error last time around that caused + # the default vendor-OS to not have any plugins at all - so we add + # the default plugins here: $metaDB->addInstalledPlugin(0, 'theme'); return 1; diff --git a/config-db/OpenSLX/MetaDB/DBI.pm b/config-db/OpenSLX/MetaDB/DBI.pm index 70bc504f..746c407e 100644 --- a/config-db/OpenSLX/MetaDB/DBI.pm +++ b/config-db/OpenSLX/MetaDB/DBI.pm @@ -207,7 +207,7 @@ sub fetchInstalledPlugins my $vendorOSID = shift; my $pluginName = shift; - return if !$vendorOSID; + return if !defined $vendorOSID; my $nameClause = defined $pluginName ? "AND plugin_name = '$pluginName'" @@ -707,7 +707,7 @@ sub addInstalledPlugin my $vendorOSID = shift; my $pluginName = shift; - return if !$vendorOSID || !$pluginName; + return if !defined $vendorOSID || !$pluginName; return if $self->fetchInstalledPlugins($vendorOSID, $pluginName); return $self->_doInsert('installed_plugin', [ { @@ -722,7 +722,7 @@ sub removeInstalledPlugin my $vendorOSID = shift; my $pluginName = shift; - return if !$vendorOSID || !$pluginName; + return if !defined $vendorOSID || !$pluginName; my $plugin = $self->fetchInstalledPlugins($vendorOSID, $pluginName); return if !$plugin; |