fixing wrong title and icon displayed when a widget is added with a s…

…eparate title and icon; fixes #269
auth0 · Jan 31, 2018 · aed2c0e · aed2c0e
1 parent 1bd0c05
commit aed2c0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/lib/WP_Auth0_Lock10_Options.php b/lib/WP_Auth0_Lock10_Options.php
@@ -254,8 +254,7 @@ public function get_lock_options() {
       $extraOptions["auth"]["redirectUrl"] = $this->get_code_callback_url();
     }
 
-    $options_obj = array_merge_recursive( $extraOptions, $options_obj  );
-    $options_obj = array_merge_recursive( $options_obj , $extended_settings );
+    $options_obj = array_replace_recursive( $extraOptions, $options_obj, $extended_settings );
 
     if ( ! $this->show_as_modal() ) {
       $options_obj['container'] = 'auth0-login-form';

diff --git a/lib/WP_Auth0_Lock_Options.php b/lib/WP_Auth0_Lock_Options.php
@@ -230,8 +230,7 @@ public function get_lock_options() {
 			$extraOptions["callbackURL"] = $this->get_code_callback_url();
 		}
 
-		$options_obj = array_merge( $extraOptions, $options_obj  );
-		$options_obj = array_merge( $options_obj , $extended_settings );
+		$options_obj = array_merge( $extraOptions, $options_obj, $extended_settings );
 
 		if ( ! $this->show_as_modal() ) {
 			$options_obj['container'] = 'auth0-login-form';