Fix the way GPL / pro detection is done

virtualmin · Mar 26, 2017 · d34bc6b · d34bc6b
1 parent 89e3b0a
commit d34bc6b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/module.info b/module.info
@@ -8,7 +8,6 @@ desc_de=Virtualmin Virtuelle Server
 desc_fr=Serveurs virtuels Virtualmin
 readonly=1
 feedback=feedback@webmin.com
-virtualmin=pro
 desc_tr=Virtualmin Sanal Sunucular&#305;
 desc_nl=Virtualmin Virtuele Servers
 desc_cz=Virtu�ln� servery Virtualmin

diff --git a/virtual-server-lib.pl b/virtual-server-lib.pl
@@ -48,7 +48,7 @@
 	}
 
 # For the GPL version, force some features off.
-$virtualmin_pro = $module_info{'virtualmin'} eq 'pro' ? 1 : 0;
+$virtualmin_pro = $module_info{'version'} =~ /gpl/ ? 0 : 1;
 if (!$virtualmin_pro) {
 	$config{'status'} = 0;
 	}