[Pkg-owncloud-commits] [owncloud] 05/83: use empty to check for null and ''

[David Prévot]

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

taffit pushed a commit to branch 5.0
in repository owncloud.

commit b9a62e9b5130f43ded3ca0ecc70a0d7acb73b610
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Fri Nov 8 14:57:05 2013 +0100

    use empty to check for null and ''
---
 lib/db.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/db.php b/lib/db.php
index 4932c5f..452c31b 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -567,8 +567,8 @@ class OC_DB {
 		$CONFIG_DBHOST = OC_Config::getValue('dbhost', '');
 
 		if( $CONFIG_DBTYPE === 'oci'
-			&& $CONFIG_DBNAME === '' 
-			&& $CONFIG_DBHOST !== null && $CONFIG_DBHOST !== ''
+			&& $CONFIG_DBNAME === ''
+			&& ! empty($CONFIG_DBHOST)
 		) {
 			// we are connecting by user name, pwd and SID (host)
 			$CONFIG_DBUSER = OC_Config::getValue('dbuser', '');

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