summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorChris Passas <cpassas@gmail.com>2013-02-13 17:47:02 +0100
committerChris Passas <cpassas@gmail.com>2013-02-15 21:03:28 +0100
commitb0607703b32ec790cc300e9f77a18ea17ab6d7dd (patch)
tree9a0c9602b45f0f25c4ee0363dca11defc3bb9090 /system/core
parent614cc1c384b84801428f9823007586584af00653 (diff)
Revert "Revert "Update system/core/Common.php""
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Common.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Common.php b/system/core/Common.php
index 258cd4967..b9c872748 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -343,7 +343,7 @@ if ( ! function_exists('is_https'))
*/
function is_https()
{
- return ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off');
+ return ( ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off' ) || ($_SERVER["SERVER_PORT"] === '443') );
}
}
@@ -713,4 +713,4 @@ if ( ! function_exists('function_usable'))
}
/* End of file Common.php */
-/* Location: ./system/core/Common.php */ \ No newline at end of file
+/* Location: ./system/core/Common.php */