X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fskins%2FSkinTemplate.php;h=a7b7569f0e10c1d761ebf2ace800ee2c5f5ed35b;hb=6192cbf0c4012624d5be96f446f05d9d07c7beab;hp=ef45d15e2bc5ca7a4b13cd4f643d63d986b6893b;hpb=956ffb9cd77bb9748cf7bc425d50f0eea7e3abdd;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php index ef45d15e2b..a7b7569f0e 100644 --- a/includes/skins/SkinTemplate.php +++ b/includes/skins/SkinTemplate.php @@ -622,7 +622,6 @@ class SkinTemplate extends Skin { $returnto['returnto'] = $page; $query = $request->getVal( 'returntoquery', $this->thisquery ); $paramsArray = wfCgiToArray( $query ); - unset( $paramsArray['logoutToken'] ); $query = wfArrayToCgi( $paramsArray ); if ( $query != '' ) { $returnto['returntoquery'] = $query; @@ -695,8 +694,7 @@ class SkinTemplate extends Skin { 'href' => self::makeSpecialUrl( 'Userlogout', // Note: userlogout link must always contain an & character, otherwise we might not be able // to detect a buggy precaching proxy (T19790) - ( $title->isSpecial( 'Preferences' ) ? [] : $returnto ) - + [ 'logoutToken' => $this->getUser()->getEditToken( 'logoutToken', $this->getRequest() ) ] ), + ( $title->isSpecial( 'Preferences' ) ? [] : $returnto ) ), 'active' => false ]; }