diff --git a/lib/private/util.php b/lib/private/util.php index 1c3177af4351f7cece73a9edcca220d5aa377b0d..f76ee7b338a47984fbc8f07d87b04bd32c0e9e60 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -1113,7 +1113,7 @@ class OC_Util { curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); } - if (ini_get('open_basedir') === '' && ini_get('safe_mode' === 'Off')) { + if (ini_get('open_basedir') === '' && ini_get('safe_mode') === 'Off') { curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true); curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects); $data = curl_exec($curl); diff --git a/lib/public/contacts.php b/lib/public/contacts.php index 0d12e91c67fee83e11fff10936421cef9d3db21d..fb88c13bd1b4067c945a3039fcf5baae3712c02c 100644 --- a/lib/public/contacts.php +++ b/lib/public/contacts.php @@ -116,7 +116,7 @@ namespace OCP { */ public static function createOrUpdate($properties, $address_book_key) { $cm = \OC::$server->getContactsManager(); - return $cm->search($properties, $address_book_key); + return $cm->createOrUpdate($properties, $address_book_key); } /**