Merged revisions 3028-3045 from stable branch.

tbrehm

2012-04-12 02bf997271f4d09e91c8fcb9cecd08f06f2400c4

 server/plugins-available/firewall_plugin.inc.php

@@ -38,7 +38,11 @@
   function onInstall() {
      global $conf;
      
      return true;
      if($conf['bastille']['installed'] = true && $conf['services']['firewall'] == true) {
         return true;
      } else {
         return false;
      }
      
   }