Removed redundant isSsl check.

mvied · Jul 21, 2012 · 6ad8d14 · 6ad8d14
1 parent 1fca300
commit 6ad8d14
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/WordPressHTTPS.php b/lib/WordPressHTTPS.php
@@ -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');
 			}
 		}

diff --git a/lib/WordPressHTTPS/Module/Hooks.php b/lib/WordPressHTTPS/Module/Hooks.php
@@ -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');
 		}