Merge pull request #154 from auth0/dev

2.1.4
auth0 · Mar 18, 2016 · 6fdeb4e · 6fdeb4e
2 parents 0d878d7 + 33098a4
commit 6fdeb4e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/WP_Auth0.php b/WP_Auth0.php
@@ -2,7 +2,7 @@
 /**
  * Plugin Name: Auth0 for WordPress
  * Description: Implements the Auth0 Single Sign On solution into Wordpress
- * Version: 2.1.3
+ * Version: 2.1.4
  * Author: Auth0
  * Author URI: https://auth0.com
  */
@@ -12,7 +12,7 @@
 define( 'WPA0_PLUGIN_URL', trailingslashit( plugin_dir_url( __FILE__ ) ) );
 define( 'WPA0_LANG', 'wp-auth0' );
 define( 'AUTH0_DB_VERSION', 4 );
-define( 'WPA0_VERSION', '2.1.3' );
+define( 'WPA0_VERSION', '2.1.4' );
 
 /**
  * Main plugin class
@@ -223,7 +223,7 @@ public function shortcode( $atts ) {
 		}
 
 		if (!isset($atts['redirect_to'])) {
-			$atts['redirect_to'] = $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+			$atts['redirect_to'] = home_url($_SERVER["REQUEST_URI"]);
 		}
 
 		ob_start();

diff --git a/lib/WP_Auth0_Embed_Widget.php b/lib/WP_Auth0_Embed_Widget.php
@@ -57,7 +57,7 @@ public function widget( $args, $instance ) {
 			$instance['modal_trigger_name'] = isset( $instance['modal_trigger_name'] ) ? $instance['modal_trigger_name'] : 'Login';
 
 			if (!isset($instance['redirect_to'])) {
-				$instance['redirect_to'] = $_SERVER["HTTP_HOST"] . $_SERVER["REQUEST_URI"];
+				$instance['redirect_to'] = home_url($_SERVER["REQUEST_URI"]);
 			}
 
 			require_once WPA0_PLUGIN_DIR . 'templates/login-form.php';

diff --git a/lib/WP_Auth0_Lock_Options.php b/lib/WP_Auth0_Lock_Options.php
@@ -81,7 +81,7 @@ public function is_registration_enabled() {
     }
 
     public function show_as_modal() {
-        return (isset($this->extended_settings['show_as_modal']) && $this->extended_settings['show_as_modal'] == 1);
+        return (isset($this->extended_settings['show_as_modal']) && $this->extended_settings['show_as_modal']);
     }
 
     public function modal_button_name() {

diff --git a/lib/WP_Auth0_LoginManager.php b/lib/WP_Auth0_LoginManager.php
@@ -348,7 +348,7 @@ public function login_user( $userinfo, $id_token, $access_token ) {
 
 		if ( ! $this->ignore_unverified_email &&  1 == $requires_verified_email ) {
 			if ( empty( $userinfo->email ) ) {
-				$msg = __( 'This account does not have an email associated, as required by your site administrator.”', WPA0_LANG );
+				$msg = __( 'This account does not have an email associated, as required by your site administrator.', WPA0_LANG );
 				$msg .= '<br/><br/>';
 				$msg .= '<a href="' . home_url() . '">' . __( '← Go back', WPA0_LANG ) . '</a>';
 

diff --git a/lib/WP_Auth0_UserCreator.php b/lib/WP_Auth0_UserCreator.php
@@ -1,4 +1,4 @@
-Please contact your site’s administrator.<?php
+<?php
 
 class WP_Auth0_UserCreator {