Fixed wrong title and icon for login widget #385
Conversation
…eparate title and icon; fixes #269
| @@ -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 ); | |||
There was a problem hiding this comment.
So what is the logic here for duplicate entries. extraOptions are over ridden by options_obj but this can then be over ridden by extended_settings?
There was a problem hiding this comment.
@cocojoe - Correct.
There was a problem hiding this comment.
the naming seems odd. However, it is the same order as the original so fair enough
| @@ -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 ); | |||
There was a problem hiding this comment.
In the previous snippet you change merge to replace why does this one stay as merge?
There was a problem hiding this comment.
@cocojoe - Array dimensions, recursive vs. not recursive. array_merge_recursive can create arrays out of strings, whereas array_replace_recursive overrides. array_merge also overrides but it only goes 1 level deep. Looks like the options arrays are built differently.
|
@cocojoe - Ready for re-review |
Swapped in
array_replace_recursiveinstead ofarray_merge_recursiveto avoid an array being created that the Lock widget couldn't understand.