ci-bonfire / Sprint

system/database/drivers/oci8/oci8_driver.php

Braces +6 added lines, -12 removed lines

@@ -176,8 +176,7 @@ 
 		{
 			$this->dsn = $this->hostname;
 			return;
-		}
-		elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
+		} elseif ($this->hostname !== '' && strpos($this->hostname, '/') === FALSE && strpos($this->hostname, ':') === FALSE
 			&& (( ! empty($this->port) && ctype_digit($this->port)) OR $this->database !== ''))
 		{
 			/* If the hostname field isn't empty, doesn't contain
@@ -255,8 +254,7 @@ 
 		if ( ! $this->conn_id OR ($version_string = oci_server_version($this->conn_id)) === FALSE)
 		{
 			return FALSE;
-		}
-		elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
+		} elseif (preg_match('#Release\s(\d+(?:\.\d+)+)#', $version_string, $match))
 		{
 			return $this->data_cache['version'] = $match[1];
 		}
@@ -480,8 +478,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -504,8 +501,7 @@ 
 		if (strpos($table, '.') !== FALSE)
 		{
 			sscanf($table, '%[^.].%s', $owner, $table);
-		}
-		else
+		} else
 		{
 			$owner = $this->username;
 		}
@@ -565,12 +561,10 @@ 
 		if (is_resource($this->curs_id))
 		{
 			return oci_error($this->curs_id);
-		}
-		elseif (is_resource($this->stmt_id))
+		} elseif (is_resource($this->stmt_id))
 		{
 			return oci_error($this->stmt_id);
-		}
-		elseif (is_resource($this->conn_id))
+		} elseif (is_resource($this->conn_id))
 		{
 			return oci_error($this->conn_id);
 		}

system/libraries/Session/Session_driver.php

Braces +1 added lines, -2 removed lines

@@ -266,8 +266,7 @@
 		if ($reduce_linebreaks === TRUE)
 		{
 			$table['#<p>\n*</p>#'] = '';
-		}
-		else
+		} else
 		{
 			// If we have empty paragraph tags we add a non-breaking space
 			// otherwise most browsers won't treat them as true paragraphs