Remove obsolete parameter 'appendSession' from LinkHandler calls

diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index dcf7f71998592b2fee6eae217cf4c2545eb77c16..92eee88ea479e044a3f32a98873ead06a3ca3e9e 100644 (file)
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -7,14 +7,14 @@
        {/if}
        
        {if $__wcf->getUser()->userID}
-               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
+               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
        {else}
-               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' appendSession=false}{/link}">
+               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed'}{/link}">
        {/if}
 {/capture}
 
 {capture assign='headerNavigation'}
-       <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' appendSession=false}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
+       <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed'}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 {/capture}
 
 {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}

diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index 43ba9b8fe60d0a252112e5c32f291739e7fd4770..dbcbeba40606b9a28ac15ee6b99d60d5653b5f03 100644 (file)
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -11,14 +11,14 @@
        {/if}
        
        {if $__wcf->getUser()->userID}
-               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
+               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
        {else}
-               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID appendSession=false}{/link}">
+               <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='ArticleFeed' id=$categoryID}{/link}">
        {/if}
 {/capture}
 
 {capture assign='headerNavigation'}
-       <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' id=$categoryID appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' id=$categoryID appendSession=false}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
+       <li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' id=$categoryID}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' id=$categoryID}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 {/capture}
 
 {if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index 1919a439517c407cd8a6000c03164c1d7fe153f3..83d8b250f1b352ec287c08c3fae2f2c207c98b96 100644 (file)
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -18,11 +18,11 @@
 {/capture}
 
 {capture assign='headContent'}
-       <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
+       <link rel="alternate" type="application/rss+xml" title="{lang}wcf.global.button.rss{/lang}" href="{link controller='NotificationFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}">
 {/capture}
 
 {capture assign='headerNavigation'}
-       <li><a rel="alternate" href="{link controller='NotificationFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
+       <li><a rel="alternate" href="{link controller='NotificationFeed'}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 {/capture}
 
 {include file='userMenuSidebar'}

diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
index 79037cf859badc4ffe57e203ed4bab1ef18df694..9948a5599af2a67d9d299b506a36d85cd9f71597 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
@@ -20,13 +20,13 @@
 
 {event name='settings'}
 
-<div id="pageHeaderSearch" class="pageHeaderSearch" itemscope itemtype="http://schema.org/WebSite" itemid="{link appendSession=false}{/link}">
-       <meta itemprop="url" content="{link appendSession=false}{/link}">
+<div id="pageHeaderSearch" class="pageHeaderSearch" itemscope itemtype="http://schema.org/WebSite" itemid="{link}{/link}">
+       <meta itemprop="url" content="{link}{/link}">
        <meta itemprop="name" content="{PAGE_TITLE|language}">
        <meta itemprop="description" content="{PAGE_DESCRIPTION|language}">
        
        <form method="post" action="{@$__searchLink}" itemprop="potentialAction" itemscope itemtype="http://schema.org/SearchAction">
-               <meta itemprop="target" content="{link controller='Search' appendSession=false}q={/link}{literal}{q}{/literal}">
+               <meta itemprop="target" content="{link controller='Search'}q={/link}{literal}{q}{/literal}">
                
                <div id="pageHeaderSearchInputContainer" class="pageHeaderSearchInputContainer">
                        <div class="pageHeaderSearchType dropdown">

diff --git a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
index 9cdab127e3659533df5a0de4e84aa9dd81b32de8..6f40840b4284a65c3a26c5f5f00f78950eabb0e3 100644 (file)
--- a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php
@@ -33,9 +33,7 @@ class GoogleAuthAction extends AbstractAction {
        public function execute() {
                parent::execute();
                
-               $callbackURL = LinkHandler::getInstance()->getLink('GoogleAuth', [
-                       'appendSession' => false
-               ]);
+               $callbackURL = LinkHandler::getInstance()->getLink('GoogleAuth');
                // user accepted the connection
                if (isset($_GET['code'])) {
                        try {

diff --git a/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php b/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
index d80c0b061005c0e26598e77552d052e84086c030..360d96bc065472f45e975bf637b1f067f2452ff5 100644 (file)
--- a/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
+++ b/wcfsetup/install/files/lib/action/TwitterAuthAction.class.php
@@ -146,9 +146,7 @@ class TwitterAuthAction extends AbstractAction {
                
                // start auth by fetching request_token
                try {
-                       $callbackURL = LinkHandler::getInstance()->getLink('TwitterAuth', [
-                               'appendSession' => false
-                       ]);
+                       $callbackURL = LinkHandler::getInstance()->getLink('TwitterAuth');
                        $oauthHeader = [
                                'oauth_callback' => $callbackURL,
                                'oauth_consumer_key' => StringUtil::trim(TWITTER_PUBLIC_KEY),

diff --git a/wcfsetup/install/files/lib/page/ArticlePage.class.php b/wcfsetup/install/files/lib/page/ArticlePage.class.php
index c554ea9fc7d20fd0b0ac9b2d3fbec95ce011375c..b4f163ac167268a78382d6f806abbd54d61f19c7 100644 (file)
--- a/wcfsetup/install/files/lib/page/ArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticlePage.class.php
@@ -104,7 +104,7 @@ class ArticlePage extends AbstractArticlePage {
                
                // add meta/og tags
                MetaTagHandler::getInstance()->addTag('og:title', 'og:title', $this->articleContent->getTitle() . ' - ' . WCF::getLanguage()->get(PAGE_TITLE), true);
-               MetaTagHandler::getInstance()->addTag('og:url', 'og:url', LinkHandler::getInstance()->getLink('Article', ['object' => $this->articleContent, 'appendSession' => false]), true);
+               MetaTagHandler::getInstance()->addTag('og:url', 'og:url', LinkHandler::getInstance()->getLink('Article', ['object' => $this->articleContent]), true);
                MetaTagHandler::getInstance()->addTag('og:type', 'og:type', 'article', true);
                MetaTagHandler::getInstance()->addTag('og:description', 'og:description', $this->articleContent->teaser, true);
                

diff --git a/wcfsetup/install/files/lib/page/UserPage.class.php b/wcfsetup/install/files/lib/page/UserPage.class.php
index d62f670b5e2e8b60da38a4ab375dc8e73cd7d660..2fc093007163231d88269080caf81e3df8c7427e 100644 (file)
--- a/wcfsetup/install/files/lib/page/UserPage.class.php
+++ b/wcfsetup/install/files/lib/page/UserPage.class.php
@@ -136,7 +136,7 @@ class UserPage extends AbstractPage {
                        $this->visitorList->readObjects();
                }
                
-               MetaTagHandler::getInstance()->addTag('og:url', 'og:url', LinkHandler::getInstance()->getLink('User', ['object' => $this->user->getDecoratedObject(), 'appendSession' => false]), true);
+               MetaTagHandler::getInstance()->addTag('og:url', 'og:url', LinkHandler::getInstance()->getLink('User', ['object' => $this->user->getDecoratedObject()]), true);
                MetaTagHandler::getInstance()->addTag('og:type', 'og:type', 'profile', true);
                MetaTagHandler::getInstance()->addTag('profile:username', 'profile:username', $this->user->username, true);
                MetaTagHandler::getInstance()->addTag('og:title', 'og:title', $this->user->username . ' - ' . WCF::getLanguage()->get('wcf.user.members') . ' - ' . WCF::getLanguage()->get(PAGE_TITLE), true);

diff --git a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php b/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php
index bd9c31fcb981159cbe015b14f398ed38a5b08d32..da71844e8fba5d8638e835f87214008f433334c4 100644 (file)
--- a/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/PreParser.class.php
@@ -264,7 +264,6 @@ class PreParser extends SingletonFactory {
                                        foreach ($usernames as $type => $username) {
                                                if (!isset($users[$username])) continue;
                                                $link = LinkHandler::getInstance()->getLink('User', [
-                                                       'appendSession' => false,
                                                        'object' => $users[$username]
                                                ]);
                                                

diff --git a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
index 8ecc0254344aaa0c5ed8fb163f42c44bc11f8847..96b7ac2feb0d1831e798133bc887c01eed1b8fd6 100644 (file)
--- a/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
+++ b/wcfsetup/install/files/lib/system/payment/method/PaypalPaymentMethod.class.php
@@ -75,7 +75,7 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
                                        <input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'">
                                        <input type="hidden" name="no_note" value="1">
                                        <input type="hidden" name="no_shipping" value="1">
-                                       <input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'">
+                                       <input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback')).'">
                                        <input type="hidden" name="quantity" value="1">
                                        <input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">
                        
@@ -96,7 +96,7 @@ class PaypalPaymentMethod extends AbstractPaymentMethod {
                                        <input type="hidden" name="lc" value="'.strtoupper(WCF::getLanguage()->languageCode).'">
                                        <input type="hidden" name="no_note" value="1">
                                        <input type="hidden" name="no_shipping" value="1">
-                                       <input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback', ['appendSession' => false])).'">
+                                       <input type="hidden" name="notify_url" value="'.StringUtil::encodeHTML(LinkHandler::getInstance()->getLink('PaypalCallback')).'">
                                        <input type="hidden" name="quantity" value="1">
                                        <input type="hidden" name="return" value="'.StringUtil::encodeHTML($returnURL).'">      
                                        

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 842549db193ea0d3724ad66f639a06509a0f5a94..d16aca383505565f224523d0370e0d4e0f38ac95 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -943,16 +943,16 @@
                <item name="wcf.acp.option.edit_history_expiration"><![CDATA[Speicherzeit]]></item>
                <item name="wcf.acp.option.edit_history_expiration.description"><![CDATA[Zeitraum, nachdem alte Einträge aus dem Bearbeitungsverlauf entfernt werden [0 um die Entfernung gänzlich zu deaktivieren]]]></item>
                <item name="wcf.acp.option.github_public_key"><![CDATA[GitHub Client ID]]></item>
-               <item name="wcf.acp.option.github_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} Client ID und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Client Secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub</a> anfordern. Die Callback URL ist: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.github_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} Client ID und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Client Secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub</a> anfordern. Die Callback URL ist: {link controller="GithubAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.github_private_key"><![CDATA[GitHub Client Secret]]></item>
                <item name="wcf.acp.option.twitter_public_key"><![CDATA[Twitter API key]]></item>
-               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deinen{else}Sie können Ihren{/if} API key und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} API secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter</a> anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deinen{else}Sie können Ihren{/if} API key und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} API secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter</a> anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.twitter_private_key"><![CDATA[Twitter API secret]]></item>
                <item name="wcf.acp.option.facebook_public_key"><![CDATA[Facebook APP-ID]]></item>
-               <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} APP-ID und {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Anwendungs-Geheimcode bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook</a> anfordern. Die OAuth redirect URI ist: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} APP-ID und {if LANGUAGE_USE_INFORMAL_VARIANT}deinen{else}Ihren{/if} Anwendungs-Geheimcode bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook</a> anfordern. Die OAuth redirect URI ist: {link controller="FacebookAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.facebook_private_key"><![CDATA[Facebook Anwendungs-Geheimcode]]></item>
                <item name="wcf.acp.option.google_public_key"><![CDATA[Google Client ID]]></item>
-               <item name="wcf.acp.option.google_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} Client ID und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Client Secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google</a> anfordern. Die Redirect-URI ist: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.google_public_key.description"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst deine{else}Sie können Ihre{/if} Client ID und {if LANGUAGE_USE_INFORMAL_VARIANT}dein{else}Ihr{/if} Client Secret bei <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google</a> anfordern. Die Redirect-URI ist: {link controller="GoogleAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.google_private_key"><![CDATA[Google Client Secret]]></item>
                <item name="wcf.acp.option.category.dashboard"><![CDATA[Dashboard]]></item>
                <item name="wcf.acp.option.category.dashboard.content"><![CDATA[Inhaltsbereich]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index a084fa630a18ac2bdb00e8d6ccb045d6d4596bc3..a511b853219610875840e76d5374eb749b0d5495 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -946,16 +946,16 @@ Examples for medium ID detection:
                <item name="wcf.acp.option.edit_history_expiration"><![CDATA[Storage Time Period]]></item>
                <item name="wcf.acp.option.edit_history_expiration.description"><![CDATA[Content in the edit history will be removed after the following days. Use 0 to disable.]]></item>
                <item name="wcf.acp.option.github_public_key"><![CDATA[GitHub Client ID]]></item>
-               <item name="wcf.acp.option.github_public_key.description"><![CDATA[You can obtain both your Client ID and Client Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub</a>. The Callback URL is: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.github_public_key.description"><![CDATA[You can obtain both your Client ID and Client Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub</a>. The Callback URL is: {link controller="GithubAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.github_private_key"><![CDATA[GitHub Client Secret]]></item>
                <item name="wcf.acp.option.twitter_public_key"><![CDATA[Twitter API key]]></item>
-               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[You can obtain both your API key and API secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter</a>. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.twitter_public_key.description"><![CDATA[You can obtain both your API key and API secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter</a>. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.twitter_private_key"><![CDATA[Twitter API secret]]></item>
                <item name="wcf.acp.option.facebook_public_key"><![CDATA[Facebook APP-ID]]></item>
-               <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[You can obtain your APP-ID and Application Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook</a>. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.facebook_public_key.description"><![CDATA[You can obtain your APP-ID and Application Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook</a>. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.facebook_private_key"><![CDATA[Facebook Application Secret]]></item>
                <item name="wcf.acp.option.google_public_key"><![CDATA[Google Client ID]]></item>
-               <item name="wcf.acp.option.google_public_key.description"><![CDATA[You can obtain your Client ID and Client Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google</a>. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}]]></item>
+               <item name="wcf.acp.option.google_public_key.description"><![CDATA[You can obtain your Client ID and Client Secret at <a href="{@$__wcf->getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google</a>. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true}{/link}]]></item>
                <item name="wcf.acp.option.google_private_key"><![CDATA[Google Client Secret]]></item>
                <item name="wcf.acp.option.category.dashboard"><![CDATA[Dashboard]]></item>
                <item name="wcf.acp.option.category.dashboard.content"><![CDATA[Content Area]]></item>