Merge branch '2015.11-develop' into 2016.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:35:07 +0000 (16:35 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 24 Oct 2016 14:35:07 +0000 (16:35 +0200)
1  2 
tine20/Tinebase/Config.php

@@@ -529,10 -529,10 +529,10 @@@ class Tinebase_Config extends Tinebase_
                  ),
              ),
              'default'               => array(
 -                self::FEATURE_SHOW_ADVANCED_SEARCH  => false,
 -                self::FEATURE_CONTAINER_CUSTOM_SORT => false,
 -                self::FEATURE_SHOW_ACCOUNT_EMAIL    => false,
 -                self::FEATURE_REMEMBER_POPUP_SIZE   => false,
 +                self::FEATURE_SHOW_ADVANCED_SEARCH  => true,
 +                self::FEATURE_CONTAINER_CUSTOM_SORT => true,
 +                self::FEATURE_SHOW_ACCOUNT_EMAIL    => true,
 +                self::FEATURE_REMEMBER_POPUP_SIZE   => true,
              ),
          ),
          self::CRONUSERID => array(
                                     //_('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')