use empty to check for null and ''

diff --git a/lib/db.php b/lib/db.php
index 4932c5fb5006ee9f87576eadf17fec0081034c0b..452c31b9a60457a4befb83a94bcf1b79fdb93535 100644 (file)
--- 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', '');