Merge branch 'stable-3.1'

Marius Burkard

2016-01-29 613433fd4eed8f566e9f8f0be4b6116fe028f123

 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;
   }