Permalink
Browse files

Removed redundant isSsl check.

  • Loading branch information...
mvied committed Jul 21, 2012
1 parent 1fca300 commit 6ad8d14eed9dde59ab0af35ade6cb50cf7395d1e
Showing with 2 additions and 2 deletions.
  1. +1 −1 lib/WordPressHTTPS.php
  2. +1 −1 lib/WordPressHTTPS/Module/Hooks.php
View
@@ -124,7 +124,7 @@ public function init() {
// Redirect login page. This is not pluggable due to the redirect methods used in wp-login.php
if ( ( $GLOBALS['pagenow'] == 'wp-login.php' ) ) {
setcookie(constant('TEST_COOKIE'), 'WP Cookie check', 0);
- if ( $this->getSetting('ssl_admin') && ! $this->isSsl() ) {
+ if ( $this->getSetting('ssl_admin') ) {
$this->redirect('https');
}
}
@@ -17,7 +17,7 @@ class WordPressHTTPS_Module_Hooks extends Mvied_Plugin_Module implements Mvied_P
*/
public function init() {
// Force SSL Admin
- if ( ( is_admin() || $GLOBALS['pagenow'] == 'wp-login.php' ) && $this->getPlugin()->getSetting('ssl_admin') && ! $this->getPlugin()->isSsl() ) {
+ if ( ( is_admin() || $GLOBALS['pagenow'] == 'wp-login.php' ) && $this->getPlugin()->getSetting('ssl_admin') ) {
$this->getPlugin()->redirect('https');
}

0 comments on commit 6ad8d14

Please sign in to comment.