diff options
| author | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-12 23:28:26 +0100 |
|---|---|---|
| committer | Robin McCorkell <rmccorkell@karoshi.org.uk> | 2014-05-13 19:09:14 +0100 |
| commit | f7e777f7d2fc330dbf55c0190b5e0071c8f997ac (patch) | |
| tree | 0d63a34450d52d8242cbfa9571af3575b427405c /lib | |
| parent | bac8962bbc8cbeb4382df6bf5c8b9244c0f6340e (diff) | |
| download | nextcloud-server-f7e777f7d2fc330dbf55c0190b5e0071c8f997ac.tar.gz nextcloud-server-f7e777f7d2fc330dbf55c0190b5e0071c8f997ac.zip | |
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
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/private/util.php | 2 | ||||
| -rw-r--r-- | lib/public/contacts.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index 1c3177af435..f76ee7b338a 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 0d12e91c67f..fb88c13bd1b 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); } /** |