Merge pull request SAML-Toolkits#31 from rmccue/patch-1

pitbulk · web-flow · commit 225290360371 · 2017-02-18T01:40:28.000+01:00
Avoid double site URL concatenation
diff --git a/onelogin-saml-sso/php/settings.php b/onelogin-saml-sso/php/settings.php
@@ -57,7 +57,7 @@
     }
 }
 
-$acs_endpoint = get_site_url() . (get_option('onelogin_saml_alternative_acs', false) ? plugins_url( 'alternative_acs.php', dirname( __FILE__ ) ) : '/wp-login.php?saml_acs');
+$acs_endpoint = get_option('onelogin_saml_alternative_acs', false) ? plugins_url( 'alternative_acs.php', dirname( __FILE__ ) ) : wp_login_url() . '?saml_acs';
 
 $settings = array (
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`}`
`58`	`58`	`}`
`59`	`59`
`60`		`-$acs_endpoint = get_site_url() . (get_option('onelogin_saml_alternative_acs', false) ? plugins_url( 'alternative_acs.php', dirname( __FILE__ ) ) : '/wp-login.php?saml_acs');`
	`60`	`+$acs_endpoint = get_option('onelogin_saml_alternative_acs', false) ? plugins_url( 'alternative_acs.php', dirname( __FILE__ ) ) : wp_login_url() . '?saml_acs';`
`61`	`61`
`62`	`62`	`$settings = array (`
`63`	`63`