Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ozh/YOURLS
Browse files Browse the repository at this point in the history
  • Loading branch information
ozh committed Sep 5, 2013
2 parents e674860 + 56f1b3b commit 9dea761
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions includes/load-yourls.php
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@

// Check if we are in maintenance mode - if yes, it will die here.
yourls_check_maintenance_mode();

// Fix REQUEST_URI for IIS
yourls_fix_request_uri();

// If request for an admin page is http:// and SSL is required, redirect
if( yourls_is_admin() && yourls_needs_ssl() && !yourls_is_ssl() ) {
Expand All @@ -134,9 +137,6 @@
}
}

// Fix REQUEST_URI for IIS
yourls_fix_request_uri();

// Create the YOURLS object $ydb that will contain everything we globally need
global $ydb;

Expand Down

0 comments on commit 9dea761

Please sign in to comment.