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
This commit is contained in:
Robin McCorkell 2014-05-12 23:28:26 +01:00
parent bac8962bbc
commit f7e777f7d2
2 changed files with 2 additions and 2 deletions

View File

@ -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);

View File

@ -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);
}
/**