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)
tine20/Tinebase/Config.php
tine20/Tinebase/Controller/ScheduledImport.php
tine20/Tinebase/CustomField.php

index 4aae225..e004ad0 100644 (file)
@@ -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')
index b4862f9..8257ee0 100644 (file)
@@ -167,8 +167,8 @@ class Tinebase_Controller_ScheduledImport extends Tinebase_Controller_Record_Abs
     protected function _getFileToImport($source)
     {
         if (strpos($source, 'http') === 0) {
-            $client = new Zend_Http_Client($source);
             try {
+                $client = new Zend_Http_Client($source);
                 $requestBody = $client->request()->getBody();
             } catch (Exception $e) {
                 Tinebase_Exception::log($e);
@@ -310,4 +310,4 @@ class Tinebase_Controller_ScheduledImport extends Tinebase_Controller_Record_Abs
         
         return $this->create($record);
     }
-}
\ No newline at end of file
+}
index 4264ed4..e4d147c 100644 (file)
@@ -743,7 +743,8 @@ class Tinebase_CustomField implements Tinebase_Controller_SearchInterface
 
     public function saveCustomFieldValue(Tinebase_Model_CustomField_Value $_record)
     {
-        if (!empty($_record->getId())) {
+        $recordId = $_record->getId();
+        if (! empty($recordId)) {
             return $this->_backendValue->update($_record);
         }
         return $this->_backendValue->create($_record);