Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-03-17 21ef2a6c470b42655fee4baf5f3f4251ea2dd9ec

 server/plugins-available/mongo_clientdb_plugin.inc.php

@@ -52,11 +52,14 @@
   function onInstall() {
      global $conf;
      
      if($conf['services']['db'] == true && class_exists('MongoClient')) {
      /*if($conf['services']['db'] == true && class_exists('MongoClient')) {
         return true;
      } else {
         return false;
      }
      }*/
		
      // Disable mongodb plugin in ISPConfig 3.1
      return false;
   }