Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-07-08 341ef7175af7c8f21d27262b58da8f5bc2c06ef0

 server/plugins-available/mongo_clientdb_plugin.inc.php

@@ -51,8 +51,12 @@
    */
   function onInstall() {
      global $conf;

      return (bool) $conf['services']['db'];
		
      if($conf['services']['db'] == true && class_exists('MongoClient')) {
         return true;
      } else {
         return false;
      }
   }