From: Marcel Werk Date: Fri, 9 Dec 2016 23:11:44 +0000 (+0100) Subject: Fixed template scripting in language variables for 3rd party auth errors X-Git-Tag: 3.0.0_RC_1~57 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f49de3a8a2ae1015a2a13a494678dae7f7b1b16;p=GitHub%2FWoltLab%2FWCF.git Fixed template scripting in language variables for 3rd party auth errors --- diff --git a/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php b/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php index a5c6bca793..f5e95bd87e 100644 --- a/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php +++ b/wcfsetup/install/files/lib/action/FacebookAuthAction.class.php @@ -134,7 +134,7 @@ class FacebookAuthAction extends AbstractAction { } // user declined or any other error that may occur if (isset($_GET['error'])) { - throw new NamedUserException(WCF::getLanguage()->get('wcf.user.3rdparty.facebook.login.error.'.$_GET['error'])); + throw new NamedUserException(WCF::getLanguage()->getDynamicVariable('wcf.user.3rdparty.facebook.login.error.'.$_GET['error'])); } // start auth by redirecting to facebook diff --git a/wcfsetup/install/files/lib/action/GithubAuthAction.class.php b/wcfsetup/install/files/lib/action/GithubAuthAction.class.php index 7fb4d788de..e836f27efd 100644 --- a/wcfsetup/install/files/lib/action/GithubAuthAction.class.php +++ b/wcfsetup/install/files/lib/action/GithubAuthAction.class.php @@ -152,7 +152,7 @@ class GithubAuthAction extends AbstractAction { } // user declined or any other error that may occur if (isset($_GET['error'])) { - throw new NamedUserException(WCF::getLanguage()->get('wcf.user.3rdparty.github.login.error.'.$_GET['error'])); + throw new NamedUserException(WCF::getLanguage()->getDynamicVariable('wcf.user.3rdparty.github.login.error.'.$_GET['error'])); } // start auth by redirecting to github diff --git a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php index 6f40840b42..3ba2a4761a 100644 --- a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php +++ b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php @@ -138,7 +138,7 @@ class GoogleAuthAction extends AbstractAction { } // user declined or any other error that may occur if (isset($_GET['error'])) { - throw new NamedUserException(WCF::getLanguage()->get('wcf.user.3rdparty.google.login.error.'.$_GET['error'])); + throw new NamedUserException(WCF::getLanguage()->getDynamicVariable('wcf.user.3rdparty.google.login.error.'.$_GET['error'])); } // start auth by redirecting to google diff --git a/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php b/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php index 360d96bc06..170cdfe379 100644 --- a/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php +++ b/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php @@ -141,7 +141,7 @@ class TwitterAuthAction extends AbstractAction { // user declined if (isset($_GET['denied'])) { - throw new NamedUserException(WCF::getLanguage()->get('wcf.user.3rdparty.twitter.login.error.denied')); + throw new NamedUserException(WCF::getLanguage()->getDynamicVariable('wcf.user.3rdparty.twitter.login.error.denied')); } // start auth by fetching request_token