r55179 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r55178‎ \| r55179 \| r55180 >
Date:	13:24, 17 August 2009
Author:	tstarling
Status:	ok
Tags:
Comment:	Merging r55178 from trunk to wmf-deployment
Modified paths:	/branches/wmf-deployment/extensions (modified) (history) /branches/wmf-deployment/extensions/CentralAuth (modified) (history) /branches/wmf-deployment/extensions/CodeReview (modified) (history) /branches/wmf-deployment/extensions/Collection (modified) (history) /branches/wmf-deployment/extensions/FlaggedRevs (modified) (history) /branches/wmf-deployment/extensions/HoneypotIntegration (modified) (history) /branches/wmf-deployment/extensions/MWSearch (modified) (history) /branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php (modified) (history) /branches/wmf-deployment/extensions/MetavidWiki/skins/add_media_wizard.OFF.js (modified) (history) /branches/wmf-deployment/extensions/SecurePoll (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/cli/testDebian.php (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/includes/Base.php (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.css (modified) (history) /branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.js (modified) (history) /branches/wmf-deployment/extensions/SyntaxHighlight_GeSHi (modified) (history) /branches/wmf-deployment/extensions/TitleKey (modified) (history) /branches/wmf-deployment/extensions/UsabilityInitiative (modified) (history) /branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/images (modified) (history) /branches/wmf-deployment/extensions/WikimediaMessages (modified) (history) /branches/wmf-deployment/extensions/timeline (modified) (history)

Diff [purge]

Property changes on: branches/wmf-deployment/extensions/Collection
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /branches/REL1_15/phase3/extensions/Collection:51646
/trunk/extensions/Collection:52089-52290,52859,52871-52872,52876,53191,53205-53206,53272,53350,54124,54715,54758,54762,54778,54781,54786,54810-54811
2	2	+ /branches/REL1_15/phase3/extensions/Collection:51646
/trunk/extensions/Collection:52089-52290,52859,52871-52872,52876,53191,53205-53206,53272,53350,54124,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative/EditToolbar/images
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /trunk/extensions/UsabilityInitiative/EditToolbar/images:54467-54593,54597,54607,54619,54625,54642,54647-54648,54662-54664,54675,54682,54715,54717,54720,54732,54738,54743,54749,54756,54758,54762,54778,54781,54786,54810-54811
4	4	+ /trunk/extensions/UsabilityInitiative/EditToolbar/images:54467-54593,54597,54607,54619,54625,54642,54647-54648,54662-54664,54675,54682,54715,54717,54720,54732,54738,54743,54749,54756,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/UsabilityInitiative
___________________________________________________________________
Name: svn:mergeinfo
5	5	- /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/trunk/extensions/UsabilityInitiative:52089-54593,54597,54607,54619,54625,54642,54647-54648,54662-54664,54675,54682,54715,54717,54720,54732,54738,54743,54749,54756,54758,54762,54778,54781,54786,54810-54811
6	6	+ /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/trunk/extensions/UsabilityInitiative:52089-54593,54597,54607,54619,54625,54642,54647-54648,54662-54664,54675,54682,54715,54717,54720,54732,54738,54743,54749,54756,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/CodeReview
___________________________________________________________________
Name: svn:mergeinfo
7	7	- /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497,54715,54758,54762,54778,54781,54786,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
8	8	+ /branches/REL1_15/phase3/extensions/CodeReview:51646
/trunk/extensions/CodeReview:52089-54497,54715,54758,54762,54778,54781,54786,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/timeline
___________________________________________________________________
Name: svn:mergeinfo
9	9	- /branches/REL1_15/phase3/extensions/timeline:51646
/trunk/extensions/timeline:52089-52591,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
10	10	+ /branches/REL1_15/phase3/extensions/timeline:51646
/trunk/extensions/timeline:52089-52591,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SyntaxHighlight_GeSHi
___________________________________________________________________
Name: svn:mergeinfo
11	11	- /branches/REL1_15/phase3/extensions/SyntaxHighlight_GeSHi:51646
/trunk/extensions/SyntaxHighlight_GeSHi:52089-52346,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
12	12	+ /branches/REL1_15/phase3/extensions/SyntaxHighlight_GeSHi:51646
/trunk/extensions/SyntaxHighlight_GeSHi:52089-52346,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/HoneypotIntegration
___________________________________________________________________
Name: svn:mergeinfo
13	13	- /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54925
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration: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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
14	14	+ /branches/REL1_15/phase3/extensions/HoneypotIntegration:51646
/trunk/extensions/HoneypotIntegration:52089-54925,55178
/trunk/phase3/HoneypotIntegration:52859,53272
/trunk/phase3/extensions/HoneypotIntegration: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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/TitleKey
___________________________________________________________________
Name: svn:mergeinfo
15	15	- /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533,54715,54758,54762,54778,54781,54786,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
16	16	+ /branches/REL1_15/phase3/extensions/TitleKey:51646
/trunk/extensions/TitleKey:52089-54533,54715,54758,54762,54778,54781,54786,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
___________________________________________________________________
Name: svn:mergeinfo
17	17	- /branches/REL1_15/phase3/extensions/MWSearch/MWSearch_body.php:51646
/trunk/extensions/MWSearch/MWSearch_body.php:52089-52665,52859,52871-52872,52876,53191,53205-53206,53272,54125,54715,54758,54762,54778,54781,54786,54810-54811
18	18	+ /branches/REL1_15/phase3/extensions/MWSearch/MWSearch_body.php:51646
/trunk/extensions/MWSearch/MWSearch_body.php:52089-52665,52859,52871-52872,52876,53191,53205-53206,53272,54125,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/MWSearch
___________________________________________________________________
Name: svn:mergeinfo
19	19	- /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125,54715,54758,54762,54778,54781,54786,54810-54811
/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,53344,53369,53427,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
20	20	+ /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125,54715,54758,54762,54778,54781,54786,54810-54811,55178
/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,53344,53369,53427,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/WikimediaMessages
___________________________________________________________________
Name: svn:mergeinfo
21	21	- /branches/REL1_15/phase3/extensions/WikimediaMessages:51646
/trunk/extensions/WikimediaMessages:52089-52659,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
22	22	+ /branches/REL1_15/phase3/extensions/WikimediaMessages:51646
/trunk/extensions/WikimediaMessages:52089-52659,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/CentralAuth
___________________________________________________________________
Name: svn:mergeinfo
23	23	- /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602,54715,54758,54762,54778,54781,54786,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
24	24	+ /branches/REL1_15/phase3/extensions/CentralAuth:51646
/trunk/extensions/CentralAuth:52859,52871-52872,52876,53191,53205-53206,53272,53602,54715,54758,54762,54778,54781,54786,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/MetavidWiki/skins/add_media_wizard.OFF.js
___________________________________________________________________
Name: svn:mergeinfo
25	25	- /trunk/extensions/MetavidWiki/skins/add_media_wizard.OFF.js:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
/trunk/phase3/MetavidWiki/skins/add_media_wizard.OFF.js:52859,53272
26	26	+ /trunk/extensions/MetavidWiki/skins/add_media_wizard.OFF.js:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/MetavidWiki/skins/add_media_wizard.OFF.js:52859,53272
Property changes on: branches/wmf-deployment/extensions/FlaggedRevs
___________________________________________________________________
Name: svn:mergeinfo
27	27	- /branches/REL1_15/phase3/extensions/FlaggedRevs:51646
/trunk/extensions/FlaggedRevs:52089-52092,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
28	28	+ /branches/REL1_15/phase3/extensions/FlaggedRevs:51646
/trunk/extensions/FlaggedRevs:52089-52092,52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SecurePoll/includes/Base.php
___________________________________________________________________
Name: svn:mergeinfo
29	29	- /trunk/extensions/BoardVote/includes/Base.php:6303-48670
/trunk/extensions/SecurePoll/includes/Base.php:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811
30	30	+ /trunk/extensions/BoardVote/includes/Base.php:6303-48670
/trunk/extensions/SecurePoll/includes/Base.php:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/testDebian.php
___________________________________________________________________
Name: svn:mergeinfo
31	31	- /trunk/extensions/BoardVote/cli/testDebian.php:6303-48670
/trunk/extensions/SecurePoll/cli/testDebian.php:54715,54758,54762,54778,54781,54786,54797,54810-54811
32	32	+ /trunk/extensions/BoardVote/cli/testDebian.php:6303-48670
/trunk/extensions/SecurePoll/cli/testDebian.php:54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SecurePoll/cli/wm-scripts
___________________________________________________________________
Name: svn:mergeinfo
33	33	- /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715,54758,54762,54778,54781,54786,54797,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
34	34	+ /branches/REL1_15/phase3/extensions/SecurePoll/cli/wm-scripts:51646
/trunk/extensions/SecurePoll/cli/wm-scripts:52089-53866,54105,54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.css
___________________________________________________________________
Name: svn:mergeinfo
35	35	- /trunk/extensions/BoardVote/resources/SecurePoll.css:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.css:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811
36	36	+ /trunk/extensions/BoardVote/resources/SecurePoll.css:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.css:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SecurePoll/resources/SecurePoll.js
___________________________________________________________________
Name: svn:mergeinfo
37	37	- /trunk/extensions/BoardVote/resources/SecurePoll.js:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.js:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811
38	38	+ /trunk/extensions/BoardVote/resources/SecurePoll.js:6303-48670
/trunk/extensions/SecurePoll/resources/SecurePoll.js:53858-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
Property changes on: branches/wmf-deployment/extensions/SecurePoll
___________________________________________________________________
Name: svn:mergeinfo
39	39	- /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
40	40	+ /branches/REL1_15/phase3/extensions/SecurePoll:51646
/trunk/extensions/SecurePoll:52089-53866,54715,54758,54762,54778,54781,54786,54797,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
Property changes on: branches/wmf-deployment/extensions
___________________________________________________________________
Name: svn:mergeinfo
41	41	- /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806
42	42	+ /branches/REL1_15/phase3/extensions:51646
/trunk/extensions:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/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,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r55178	* Fixed XSS vulnerability introduced by r49833. Only pre-release versions of ...	tstarling	13:23, 17 August 2009

Status & tagging log

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