r54535 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r54534‎ \| r54535 \| r54536 >
Date:	18:15, 6 August 2009
Author:	brion
Status:	ok
Tags:
Comment:	Merge trunk fixes to support returnto query params, needed for OptIn smoothness * r53270 Add returntoquery= parameter to Special:Userlogin which adds a query string to the "Return to" link. Also using this parameter in the Log in and Log out links on top of the screen, so that people who click Log in from e.g. an edit page will be taken back to the edit page rather than to the page view. * r53293 Couple of issues in r53270: use accessor method and keep the function signature bc * r53305 Fix encoding issue in r53270 * r53777 Fix r53270: drop &returntoquery parameter if empty, and prevent Special:Userlogin from returning to itself, creating very long looplike URLs
Modified paths:	/branches/wmf-deployment (modified) (history) /branches/wmf-deployment/RELEASE-NOTES (modified) (history) /branches/wmf-deployment/extensions (modified) (history) /branches/wmf-deployment/extensions/CentralAuth (modified) (history) /branches/wmf-deployment/extensions/CodeReview (modified) (history) /branches/wmf-deployment/extensions/MWSearch (modified) (history) /branches/wmf-deployment/extensions/SecurePoll (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts (modified) (history) /branches/wmf-deployment/extensions/TitleKey (modified) (history) /branches/wmf-deployment/includes/ConfEditor.php (modified) (history) /branches/wmf-deployment/includes/OutputPage.php (modified) (history) /branches/wmf-deployment/includes/Skin.php (modified) (history) /branches/wmf-deployment/includes/SkinTemplate.php (modified) (history) /branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php (modified) (history) /branches/wmf-deployment/includes/specials (modified) (history) /branches/wmf-deployment/includes/specials/SpecialSearch.php (modified) (history) /branches/wmf-deployment/includes/specials/SpecialUserlogin.php (modified) (history) /branches/wmf-deployment/includes/specials/SpecialUserrights.php (modified) (history) /branches/wmf-deployment/skins/monobook (modified) (history)

Diff [purge]

Property changes on: branches/wmf-deployment/skins/monobook
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /branches/REL1_15/phase3/skins/monobook:51646
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,54384,54494
2	2	+ /branches/REL1_15/phase3/skins/monobook:51646
/trunk/phase3/skins/monobook:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53012,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/CodeReview
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497
/trunk/phase3/CodeReview:52859,53272
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
4	4	+ /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497
/trunk/phase3/CodeReview:52859,53272
/trunk/phase3/extensions/CodeReview:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/TitleKey
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533
/trunk/phase3/TitleKey:52859,53272
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
6	6	+ /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533
/trunk/phase3/TitleKey:52859,53272
/trunk/phase3/extensions/TitleKey:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/MWSearch
___________________________________________________________________
Name: svn:mergeinfo
7	7	- /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125
/trunk/phase3/MWSearch:52859,53272
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,54384,54494
8	8	+ /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125
/trunk/phase3/MWSearch:52859,53272
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/CentralAuth
___________________________________________________________________
Name: svn:mergeinfo
9	9	- /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602
/trunk/phase3/CentralAuth:52859,53272
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
10	10	+ /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602
/trunk/phase3/CentralAuth:52859,53272
/trunk/phase3/extensions/CentralAuth:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts
___________________________________________________________________
Name: svn:mergeinfo
11	11	- /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
12	12	+ /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105
/trunk/phase3/SecurePoll/cli/wm-scripts:52859,53272
/trunk/phase3/extensions/SecurePoll/cli/wm-scripts:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions/SecurePoll
___________________________________________________________________
Name: svn:mergeinfo
13	13	- /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
14	14	+ /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866
/trunk/phase3/SecurePoll:52859,53272
/trunk/phase3/extensions/SecurePoll:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/extensions
___________________________________________________________________
Name: svn:mergeinfo
15	15	- /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272
/trunk/phase3:52859,53272
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
16	16	+ /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272
/trunk/phase3:52859,53272
/trunk/phase3/extensions:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Index: branches/wmf-deployment/includes/OutputPage.php
—	—	@@ -1464,11 +1464,13 @@
1465	1465	* Add a "return to" link pointing to a specified title
1466	1466	*
1467	1467	* @param Title $title Title to link
	1468	+ * @param string $query Query string
1468	1469	*/
1469		~~- public function addReturnTo( $title ) {~~
	1470	+ public function addReturnTo( $title, $query = array() ) {
1470	1471	global $wgUser;
1471	1472	$this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) );
1472		~~- $link = wfMsgHtml( 'returnto', $wgUser->getSkin()->link( $title ) );~~
	1473	+ $link = wfMsgHtml( 'returnto', $wgUser->getSkin()->link(
	1474	+ $title, null, array(), $query ) );
1473	1475	$this->addHTML( "<p id=\"mw-returnto\">{$link}</p>\n" );
1474	1476	}
1475	1477
—	—	@@ -1479,12 +1481,16 @@
1480	1482	* @param null $unused No longer used
1481	1483	* @param Title $returnto Title to return to
1482	1484	*/
1483		~~- public function returnToMain( $unused = null, $returnto = NULL ) {~~
	1485	+ public function returnToMain( $unused = null, $returnto = null, $returntoquery = null ) {
1484	1486	global $wgRequest;
1485	1487
1486		~~- if ( $returnto == NULL ) {~~
	1488	+ if ( $returnto == null ) {
1487	1489	$returnto = $wgRequest->getText( 'returnto' );
1488	1490	}
	1491	+
	1492	+ if ( $returntoquery == null ) {
	1493	+ $returntoquery = $wgRequest->getText( 'returntoquery' );
	1494	+ }
1489	1495
1490	1496	if ( '' === $returnto ) {
1491	1497	$returnto = Title::newMainPage();
—	—	@@ -1499,7 +1505,7 @@
1500	1506	$titleObj = Title::newMainPage();
1501	1507	}
1502	1508
1503		~~- $this->addReturnTo( $titleObj );~~
	1509	+ $this->addReturnTo( $titleObj, $returntoquery );
1504	1510	}
1505	1511
1506	1512	/**
Property changes on: branches/wmf-deployment/includes/api/ApiQueryCategoryMembers.php
___________________________________________________________________
Name: svn:mergeinfo
1507	1513	- /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
1508	1514	+ /branches/REL1_15/phase3/includes/api/ApiQueryCategoryMembers.php:51646
/trunk/phase3/includes/api/ApiQueryCategoryMembers.php:28215,52089-53052,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
1509	1515	- /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
1510	1516	+ /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Index: branches/wmf-deployment/includes/SkinTemplate.php
—	—	@@ -150,6 +150,11 @@
151	151	wfProfileIn( __METHOD__ . '-stuff' );
152	152	$this->thispage = $this->mTitle->getPrefixedDBkey();
153	153	$this->thisurl = $this->mTitle->getPrefixedURL();
	154	+ $query = $wgRequest->getValues();
	155	+ unset( $query['title'] );
	156	+ unset( $query['returnto'] );
	157	+ unset( $query['returntoquery'] );
	158	+ $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
154	159	$this->loggedin = $wgUser->isLoggedIn();
155	160	$this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
156	161	$this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
—	—	@@ -495,6 +500,11 @@
496	501
497	502	/* set up the default links for the personal toolbar */
498	503	$personal_urls = array();
	504	+ $page = $wgRequest->getVal( 'returnto', $this->thisurl );
	505	+ $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
	506	+ $returnto = "returnto=$page";
	507	+ if( $this->thisquery != '' )
	508	+ $returnto .= "&returntoquery=$query";
499	509	if( $this->loggedin ) {
500	510	$personal_urls['userpage'] = array(
501	511	'text' => $this->username,
—	—	@@ -547,7 +557,7 @@
548	558	$personal_urls['logout'] = array(
549	559	'text' => wfMsg( 'userlogout' ),
550	560	'href' => self::makeSpecialUrl( 'Userlogout',
551		~~- $title->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"~~
	561	+ $title->isSpecial( 'Preferences' ) ? '' : $returnto
552	562	),
553	563	'active' => false
554	564	);
—	—	@@ -574,13 +584,13 @@
575	585	);
576	586	$personal_urls['anonlogin'] = array(
577	587	'text' => wfMsg( $loginlink ),
578		~~- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),~~
	588	+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
579	589	'active' => $title->isSpecial( 'Userlogin' )
580	590	);
581	591	} else {
582	592	$personal_urls['login'] = array(
583	593	'text' => wfMsg( $loginlink ),
584		~~- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),~~
	594	+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
585	595	'active' => $title->isSpecial( 'Userlogin' )
586	596	);
587	597	}
Property changes on: branches/wmf-deployment/includes/specials/SpecialUserrights.php
___________________________________________________________________
Name: svn:mergeinfo
588	598	- /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
589	599	+ /trunk/phase3/includes/specials/SpecialUserrights.php:36354-52116,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Index: branches/wmf-deployment/includes/specials/SpecialUserlogin.php
—	—	@@ -37,7 +37,8 @@
38	38
39	39	var $mName, $mPassword, $mRetype, $mReturnTo, $mCookieCheck, $mPosted;
40	40	var $mAction, $mCreateaccount, $mCreateaccountMail, $mMailmypassword;
41		~~- var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage, $mSkipCookieCheck;~~
	41	+ var $mLoginattempt, $mRemember, $mEmail, $mDomain, $mLanguage;
	42	+ var $mSkipCookieCheck, $mReturnToQuery;
42	43
43	44	/**
44	45	* Constructor
—	—	@@ -53,6 +54,7 @@
54	55	$this->mRetype = $request->getText( 'wpRetype' );
55	56	$this->mDomain = $request->getText( 'wpDomain' );
56	57	$this->mReturnTo = $request->getVal( 'returnto' );
	58	+ $this->mReturnToQuery = $request->getVal( 'returntoquery' );
57	59	$this->mCookieCheck = $request->getVal( 'wpCookieCheck' );
58	60	$this->mPosted = $request->wasPosted();
59	61	$this->mCreateaccount = $request->getCheck( 'wpCreateaccount' );
—	—	@@ -68,6 +70,7 @@
69	71
70	72	if ( $wgRedirectOnLogin ) {
71	73	$this->mReturnTo = $wgRedirectOnLogin;
	74	+ $this->mReturnToQuery = '';
72	75	}
73	76
74	77	if( $wgEnableEmail ) {
—	—	@@ -89,6 +92,7 @@
90	93	# When switching accounts, it sucks to get automatically logged out
91	94	if( $this->mReturnTo == $wgLang->specialPage( 'Userlogout' ) ) {
92	95	$this->mReturnTo = '';
	96	+ $this->mReturnToQuery = '';
93	97	}
94	98	}
95	99
—	—	@@ -718,8 +722,7 @@
719	723	if ( !$titleObj instanceof Title ) {
720	724	$titleObj = Title::newMainPage();
721	725	}
722		-
723		~~- $wgOut->redirect( $titleObj->getFullURL() );~~
	726	+ $wgOut->redirect( $titleObj->getFullURL( $this->mReturnToQuery ) );
724	727	}
725	728	}
726	729
—	—	@@ -752,7 +755,7 @@
753	756	$wgOut->addHTML( $injected_html );
754	757
755	758	if ( !empty( $this->mReturnTo ) ) {
756		~~- $wgOut->returnToMain( null, $this->mReturnTo );~~
	759	+ $wgOut->returnToMain( null, $this->mReturnTo, $this->mReturnToQuery );
757	760	} else {
758	761	$wgOut->returnToMain( null );
759	762	}
—	—	@@ -851,6 +854,9 @@
852	855
853	856	if ( !empty( $this->mReturnTo ) ) {
854	857	$returnto = '&returnto=' . wfUrlencode( $this->mReturnTo );
	858	+ if ( !empty( $this->mReturnToQuery ) )
	859	+ $returnto .= '&returntoquery=' .
	860	+ wfUrlencode( $this->mReturnToQuery );
855	861	$q .= $returnto;
856	862	$linkq .= $returnto;
857	863	}
Property changes on: branches/wmf-deployment/includes/specials/SpecialSearch.php
___________________________________________________________________
Name: svn:mergeinfo
858	864	- /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
859	865	+ /trunk/phase3/includes/specials/SpecialSearch.php:36354-52665,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
860	866	- /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
861	867	+ /trunk/phase3/includes/specials:36354-52088,52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Property changes on: branches/wmf-deployment/includes/Skin.php
___________________________________________________________________
Name: svn:mergeinfo
862	868	- /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
863	869	+ /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494
Index: branches/wmf-deployment/RELEASE-NOTES
—	—	@@ -202,6 +202,8 @@
203	203	* Show user preference 'Use live preview' if $wgLivePreview is enabled only
204	204	* (bug 17014) Blocked users can no longer use Special:UserRights if they do
205	205	not have the 'userrights' permission.
	206	+* Log in and log out links no longer return to page view when clicked from
	207	+ history view, edit page, or something similar
206	208
207	209	== API changes in 1.16 ==
208	210
Property changes on: branches/wmf-deployment
___________________________________________________________________
Name: svn:mergeinfo
209	211	- /branches/REL1_15/phase3:51646
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384,54494
210	212	+ /branches/REL1_15/phase3:51646
/trunk/phase3:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53369,53502-53504,53506,53777,54384,54494

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r53270	Add returntoquery= parameter to Special:Userlogin which adds a query string t...	catrope	21:25, 14 July 2009
r53293	Couple of issues in r53270: use accessor method and keep the function signatu...	nikerabbit	06:43, 15 July 2009
r53305	Fix encoding issue in r53270	catrope	10:22, 15 July 2009
r53777	Fix r53270: drop &returntoquery parameter if empty, and prevent Special:Userl...	catrope	10:34, 26 July 2009

Status & tagging log

23:38, 11 September 2009 Brion VIBBER (talk | contribs) changed the status of r54535 [removed: new added: ok]