Merge branch '2015.11' into 2015.11-develop

[tine20] / tine20 / Tinebase / Config.php

diff --git a/tine20/Tinebase/Config.php b/tine20/Tinebase/Config.php
index 6d9700a..437eec5 100644 (file)
--- a/tine20/Tinebase/Config.php
+++ b/tine20/Tinebase/Config.php
@@ -611,9 +611,10 @@ class Tinebase_Config extends Tinebase_Config_Abstract
                                    //_('Use of external Geolocation services is allowed.')
             'description'           => 'Use of external Geolocation services is allowed.',
             'type'                  => 'bool',
-            'clientRegistryInclude' => TRUE,
-            'setByAdminModule'      => FALSE,
-            'setBySetupModule'      => TRUE,
+            'clientRegistryInclude' => true,
+            'setByAdminModule'      => false,
+            'setBySetupModule'      => true,
+            'default'               => true,
         ),
         self::LDAP_DISABLE_TLSREQCERT => array(
                                    //_('Disable LDAP TLS Certificate Check')