Browse files

Merge branch 'master' of https://github.com/acidvertigo/oscommerce2

  • Loading branch information...
2 parents 6048608 + 85042aa commit b9740147842edd7d0a595996654bc2c0de285286 @acidvertigo acidvertigo committed Nov 21, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 catalog/includes/functions/general.php
View
2 catalog/includes/functions/general.php
@@ -36,7 +36,7 @@ function tep_redirect($url) {
tep_redirect(tep_href_link(FILENAME_DEFAULT, '', 'NONSSL', false));
}
- if ( (ENABLE_SSL == true) && (getenv('HTTPS') == 'on') ) { // We are loading an SSL page
+ if ( (ENABLE_SSL == 'true') && ($_ENV['HTTPS'] == 'on') ) { // We are loading an SSL page
if (substr($url, 0, strlen(HTTP_SERVER)) == HTTP_SERVER) { // NONSSL url
$url = HTTPS_SERVER . substr($url, strlen(HTTP_SERVER)); // Change it to SSL
}

0 comments on commit b974014

Please sign in to comment.