Merge upstream

bcit-ci · Feb 1, 2012 · 2df9cba · 2df9cba
2 parents cee2efb + 27c80af
commit 2df9cba
Show file tree

Hide file tree

Showing 20 changed files with 479 additions and 829 deletions.
diff --git a/system/core/Config.php b/system/core/Config.php
@@ -80,7 +80,7 @@ public function __construct()
 		{
 			if (isset($_SERVER['HTTP_HOST']))
 			{
-				$base_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
+				$base_url = ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ? 'https' : 'http';
 				$base_url .= '://'. $_SERVER['HTTP_HOST']
 					. str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 			}

diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -257,7 +257,7 @@ function version()
 
 		// Some DBs have functions that return the version, and don't run special
 		// SQL queries per se. In these instances, just return the result.
-		$driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo');
+		$driver_version_exceptions = array('oci8', 'sqlite', 'cubrid', 'pdo', 'mysqli');
 
 		if (in_array($this->dbdriver, $driver_version_exceptions))
 		{