Skip to content
Snippets Groups Projects
Commit f7e777f7 authored by Robin McCorkell's avatar Robin McCorkell
Browse files

Fix various code errors detected by Scrutinizer

Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
parent bac8962b
No related branches found
No related tags found
No related merge requests found
...@@ -1113,7 +1113,7 @@ class OC_Util { ...@@ -1113,7 +1113,7 @@ class OC_Util {
curl_setopt($curl, CURLOPT_PROXYUSERPWD, OC_Config::getValue('proxyuserpwd')); 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_FOLLOWLOCATION, true);
curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects); curl_setopt($curl, CURLOPT_MAXREDIRS, $max_redirects);
$data = curl_exec($curl); $data = curl_exec($curl);
......
...@@ -116,7 +116,7 @@ namespace OCP { ...@@ -116,7 +116,7 @@ namespace OCP {
*/ */
public static function createOrUpdate($properties, $address_book_key) { public static function createOrUpdate($properties, $address_book_key) {
$cm = \OC::$server->getContactsManager(); $cm = \OC::$server->getContactsManager();
return $cm->search($properties, $address_book_key); return $cm->createOrUpdate($properties, $address_book_key);
} }
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment