Skip to content

Commit

Permalink
Revert "Removed this, will add to different pull"
Browse files Browse the repository at this point in the history
This reverts commit 4a83cfd.
  • Loading branch information
Ryan Thompson committed Jun 27, 2012
1 parent 0b1d429 commit 7dff13d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion system/cms/libraries/MX/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public function locate($segments) {
}

// If this domain is an alias and it is a redirect
if ($site->alias_domain !== NULL and $site->alias_type === 'redirect')
if ($site->alias_domain !== NULL and $site->alias_type === 'redirect' and str_replace(array('http://', 'https://'), '', trim(strtolower(BASE_URL), '/')) !== $site->domain)
{
$protocol = ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
? 'https' : 'http';
Expand Down

0 comments on commit 7dff13d

Please sign in to comment.