From b37952e9a55ccac525b5aefbd56c7fd71ff0a39d Mon Sep 17 00:00:00 2001 From: Fabii547 Date: Thu, 11 Aug 2016 09:27:35 +0200 Subject: [PATCH] Remove obsolete parameter 'appendSession' from LinkHandler calls --- com.woltlab.wcf/templates/articleList.tpl | 6 +++--- com.woltlab.wcf/templates/categoryArticleList.tpl | 6 +++--- com.woltlab.wcf/templates/notificationList.tpl | 4 ++-- com.woltlab.wcf/templates/pageHeaderSearch.tpl | 6 +++--- .../install/files/lib/action/GoogleAuthAction.class.php | 4 +--- .../install/files/lib/action/TwitterAuthAction.class.php | 4 +--- wcfsetup/install/files/lib/page/ArticlePage.class.php | 2 +- wcfsetup/install/files/lib/page/UserPage.class.php | 2 +- .../install/files/lib/system/bbcode/PreParser.class.php | 1 - .../system/payment/method/PaypalPaymentMethod.class.php | 4 ++-- wcfsetup/install/lang/de.xml | 8 ++++---- wcfsetup/install/lang/en.xml | 8 ++++---- 12 files changed, 25 insertions(+), 30 deletions(-) diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl index dcf7f71998..92eee88ea4 100644 --- a/com.woltlab.wcf/templates/articleList.tpl +++ b/com.woltlab.wcf/templates/articleList.tpl @@ -7,14 +7,14 @@ {/if} {if $__wcf->getUser()->userID} - + {else} - + {/if} {/capture} {capture assign='headerNavigation'} -
    • +
    • {/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 43ba9b8fe6..dbcbeba406 100644 --- a/com.woltlab.wcf/templates/categoryArticleList.tpl +++ b/com.woltlab.wcf/templates/categoryArticleList.tpl @@ -11,14 +11,14 @@ {/if} {if $__wcf->getUser()->userID} - + {else} - + {/if} {/capture} {capture assign='headerNavigation'} -
    • +
    • {/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 1919a43951..83d8b250f1 100644 --- a/com.woltlab.wcf/templates/notificationList.tpl +++ b/com.woltlab.wcf/templates/notificationList.tpl @@ -18,11 +18,11 @@ {/capture} {capture assign='headContent'} - + {/capture} {capture assign='headerNavigation'} -
    • +
    • {/capture} {include file='userMenuSidebar'} diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl index 79037cf859..9948a5599a 100644 --- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl +++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl @@ -20,13 +20,13 @@ {event name='settings'} -
    - +
    +
    - +
    diff --git a/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php b/wcfsetup/install/files/lib/action/GoogleAuthAction.class.php index 9cdab127e3..6f40840b42 100644 --- 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 d80c0b0610..360d96bc06 100644 --- 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 c554ea9fc7..b4f163ac16 100644 --- 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 d62f670b5e..2fc0930071 100644 --- 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 bd9c31fcb9..da71844e8f 100644 --- 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 8ecc025434..96b7ac2feb 100644 --- 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 { - + @@ -96,7 +96,7 @@ class PaypalPaymentMethod extends AbstractPaymentMethod { - + diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 842549db19..d16aca3835 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -943,16 +943,16 @@ - getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub anfordern. Die Callback URL ist: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub anfordern. Die Callback URL ist: {link controller="GithubAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter anfordern. Die Callback URL ist: {link controller="TwitterAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook anfordern. Die OAuth redirect URI ist: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook anfordern. Die OAuth redirect URI ist: {link controller="FacebookAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google anfordern. Die Redirect-URI ist: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google anfordern. Die Redirect-URI ist: {link controller="GoogleAuth" forceFrontend=true}{/link}]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index a084fa630a..a511b85321 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -946,16 +946,16 @@ Examples for medium ID detection: - getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub. The Callback URL is: {link controller="GithubAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://github.com/settings/applications'|rawurlencode}" class="externalURL">GitHub. The Callback URL is: {link controller="GithubAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://dev.twitter.com/apps'|rawurlencode}" class="externalURL">Twitter. The Callback URL is: {link controller="TwitterAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://developers.facebook.com/apps'|rawurlencode}" class="externalURL">Facebook. The OAuth redirect URI is: {link controller="FacebookAuth" forceFrontend=true}{/link}]]> - getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true appendSession=false}{/link}]]> + getPath()}acp/dereferrer.php?url={'https://code.google.com/apis/console/'|rawurlencode}" class="externalURL">Google. The Redirect-URI is: {link controller="GoogleAuth" forceFrontend=true}{/link}]]> -- 2.20.1