From 8e954cf5f0be61eb9ac6fa6e8f04ee6dcf4aaf23 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Thu, 24 Jan 2013 23:22:57 -0500 Subject: Use SERVER_NAME instead of HTTP_HOST. Fixes #1963. --- system/helpers/url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system') diff --git a/system/helpers/url.php b/system/helpers/url.php index 1bc81230..2641cf06 100644 --- a/system/helpers/url.php +++ b/system/helpers/url.php @@ -62,7 +62,7 @@ class url_Core { if ($site_domain === '' OR $site_domain[0] === '/') { // Guess the server name if the domain starts with slash - $base_url = $protocol.'://'.$_SERVER['HTTP_HOST'].$site_domain; + $base_url = $protocol.'://'.$_SERVER['SERVER_NAME'].$site_domain; } else { -- cgit v1.2.3 From cc91159beed09cdde8322801a1b2a501b639b036 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Fri, 25 Jan 2013 14:28:24 -0500 Subject: Follow-on to 8e954cf5f0be61eb9ac6fa6e8f04ee6dcf4aaf23 - use HTTP_HOST if there's no SERVER_NAME --- system/helpers/url.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'system') diff --git a/system/helpers/url.php b/system/helpers/url.php index 2641cf06..014f96fe 100644 --- a/system/helpers/url.php +++ b/system/helpers/url.php @@ -62,7 +62,7 @@ class url_Core { if ($site_domain === '' OR $site_domain[0] === '/') { // Guess the server name if the domain starts with slash - $base_url = $protocol.'://'.$_SERVER['SERVER_NAME'].$site_domain; + $base_url = $protocol.'://'.($_SERVER['SERVER_NAME']?$_SERVER['SERVER_NAME']:$_SERVER['HTTP_HOST']).$site_domain; } else { -- cgit v1.2.3 From 8c5d5525d0b5602e125b5c9784a7c88b9f63a303 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sat, 9 Feb 2013 14:53:07 -0500 Subject: Reset db_applied after find(). Fixes #1998. --- system/libraries/ORM.php | 1 + 1 file changed, 1 insertion(+) (limited to 'system') diff --git a/system/libraries/ORM.php b/system/libraries/ORM.php index eb34221c..16e047bc 100644 --- a/system/libraries/ORM.php +++ b/system/libraries/ORM.php @@ -1469,6 +1469,7 @@ class ORM_Core { // Load the result $result = $this->db_builder->execute($this->db); + $this->db_applied = array(); if ($array === TRUE) { -- cgit v1.2.3