[Pkg-owncloud-commits] [owncloud] 110/172: Fix various code errors detected by Scrutinizer

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit f7e777f7d2fc330dbf55c0190b5e0071c8f997ac
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Mon May 12 23:28:26 2014 +0100

    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
---
 lib/private/util.php    | 2 +-
 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 1c3177a..f76ee7b 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 0d12e91..fb88c13 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);
 		}
 
 		/**

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git