r65683 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r65682‎ \| r65683 \| r65684 >
Date:	05:56, 30 April 2010
Author:	tstarling
Status:	deferred
Tags:
Comment:	MFT r64948, bug 22970: fix JS error in FF<3.5 in upload destination check
Modified paths:	/branches/REL1_16/phase3/RELEASE-NOTES (modified) (history) /branches/REL1_16/phase3/includes (modified) (history) /branches/REL1_16/phase3/includes/Article.php (modified) (history) /branches/REL1_16/phase3/includes/ChangesList.php (modified) (history) /branches/REL1_16/phase3/includes/ConfEditor.php (modified) (history) /branches/REL1_16/phase3/includes/DefaultSettings.php (modified) (history) /branches/REL1_16/phase3/includes/HistoryPage.php (modified) (history) /branches/REL1_16/phase3/includes/LocalisationCache.php (modified) (history) /branches/REL1_16/phase3/includes/OutputPage.php (modified) (history) /branches/REL1_16/phase3/includes/api (modified) (history) /branches/REL1_16/phase3/includes/diff (modified) (history) /branches/REL1_16/phase3/includes/json/Services_JSON.php (modified) (history) /branches/REL1_16/phase3/includes/media (modified) (history) /branches/REL1_16/phase3/includes/media/Bitmap.php (modified) (history) /branches/REL1_16/phase3/includes/specials (modified) (history) /branches/REL1_16/phase3/skins/common (modified) (history) /branches/REL1_16/phase3/skins/common/jquery.js (modified) (history) /branches/REL1_16/phase3/skins/common/jquery.min.js (modified) (history) /branches/REL1_16/phase3/skins/common/upload.js (modified) (history)

Diff [purge]

Property changes on: branches/REL1_16/phase3/skins/common/jquery.js
___________________________________________________________________
Name: svn:mergeinfo
1	1	- /trunk/phase3/skins/common/jquery.js:63549,63764,63897-63901
2	2	+ /trunk/phase3/skins/common/jquery.js:63549,63764,63897-63901,64948
Property changes on: branches/REL1_16/phase3/skins/common/jquery.min.js
___________________________________________________________________
Name: svn:mergeinfo
3	3	- /trunk/phase3/skins/common/jquery.min.js:63549,63764,63897-63901
4	4	+ /trunk/phase3/skins/common/jquery.min.js:63549,63764,63897-63901,64948
Index: branches/REL1_16/phase3/skins/common/upload.js
—	—	@@ -43,17 +43,20 @@
44	44
45	45	// AJAX wpDestFile warnings
46	46	if ( wgAjaxUploadDestCheck ) {
	47	+ // Insert an event handler that fetches upload warnings when wpDestFile
	48	+ // has been changed
47	49	document.getElementById( 'wpDestFile' ).onchange = function ( e ) {
48	50	wgUploadWarningObj.checkNow(this.value);
49	51	};
	52	+ // Insert a row where the warnings will be displayed just below the
	53	+ // wpDestFile row
50	54	var optionsTable = document.getElementById( 'mw-htmlform-description' ).tBodies[0];
51		~~- var row = document.createElement( 'tr' );~~
	55	+ var row = optionsTable.insertRow( 1 );
52	56	var td = document.createElement( 'td' );
53	57	td.id = 'wpDestFile-warning';
54	58	td.colSpan = 2;
55	59
56	60	row.appendChild( td );
57		~~- optionsTable.insertBefore( row, optionsTable.children[1] );~~
58	61	}
59	62
60	63	if ( wgAjaxLicensePreview ) {
Property changes on: branches/REL1_16/phase3/skins/common
___________________________________________________________________
Name: svn:mergeinfo
61	64	+ /trunk/phase3/skins/common:63545-63546,63549,63643,63764,63897-63901,64876,64948
Property changes on: branches/REL1_16/phase3/includes/diff
___________________________________________________________________
Name: svn:mergeinfo
62	65	- /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802,64881
63	66	+ /branches/REL1_15/phase3/includes/diff:51646
/branches/sqlite/includes/diff:58211-58321
/branches/wmf-deployment/includes/diff:53381
/trunk/phase3/includes/diff:63549,63764,63897-63901,64802,64881,64948
Property changes on: branches/REL1_16/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Name: svn:mergeinfo
64	67	- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901,64881
65	68	+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:63549,63764,63897-63901,64881,64948
Property changes on: branches/REL1_16/phase3/includes/Article.php
___________________________________________________________________
Name: svn:mergeinfo
66	69	- /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64918,64934
67	70	+ /branches/REL1_15/phase3/includes/Article.php:51646
/branches/sqlite/includes/Article.php:58211-58321
/branches/wmf-deployment/includes/Article.php:53381
/trunk/phase3/includes/Article.php:63549,63764,63897-63901,64918,64934,64948
Property changes on: branches/REL1_16/phase3/includes/LocalisationCache.php
___________________________________________________________________
Name: svn:mergeinfo
68	71	- /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901,64881
69	72	+ /branches/REL1_15/phase3/includes/LocalisationCache.php:51646
/branches/sqlite/includes/LocalisationCache.php:58211-58321
/branches/wmf-deployment/includes/LocalisationCache.php:53381
/trunk/phase3/includes/LocalisationCache.php:63394,63549,63764,63897-63901,64881,64948
Property changes on: branches/REL1_16/phase3/includes/OutputPage.php
___________________________________________________________________
Name: svn:mergeinfo
70	73	- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64881,64892,64918
71	74	+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:63549,63764,63897-63901,64881,64892,64918,64948
Property changes on: branches/REL1_16/phase3/includes/HistoryPage.php
___________________________________________________________________
Name: svn:mergeinfo
72	75	- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901,64881
73	76	+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/trunk/phase3/includes/HistoryPage.php:63549,63764,63897-63901,64881,64948
Property changes on: branches/REL1_16/phase3/includes/api
___________________________________________________________________
Name: svn:mergeinfo
74	77	- /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:63549,63764,63897-63901,64454,64881
75	78	+ /branches/REL1_15/phase3/includes/api:51646
/branches/sqlite/includes/api:58211-58321
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:63549,63764,63897-63901,64454,64881,64948
Property changes on: branches/REL1_16/phase3/includes/media/Bitmap.php
___________________________________________________________________
Name: svn:mergeinfo
76	79	- /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64876,64881,64932,64935-64936,64947,65467
77	80	+ /branches/REL1_15/phase3/includes/media/Bitmap.php:51646
/branches/sqlite/includes/media/Bitmap.php:58211-58321
/branches/wmf-deployment/includes/media/Bitmap.php:53381
/trunk/phase3/includes/media/Bitmap.php:63549,63764,63897-63901,64876,64881,64932,64935-64936,64947-64948,65467
Property changes on: branches/REL1_16/phase3/includes/media
___________________________________________________________________
Name: svn:mergeinfo
78	81	- /branches/REL1_15/phase3/includes/media:51646
/branches/sqlite/includes/media:58211-58321
/branches/wmf-deployment/includes/media:53381
/trunk/phase3/includes/media:63549,63764,63897-63901,64876,64881,64935-64936,64947,65467
79	82	+ /branches/REL1_15/phase3/includes/media:51646
/branches/sqlite/includes/media:58211-58321
/branches/wmf-deployment/includes/media:53381
/trunk/phase3/includes/media:63549,63764,63897-63901,64876,64881,64935-64936,64947-64948,65467
Property changes on: branches/REL1_16/phase3/includes/ChangesList.php
___________________________________________________________________
Name: svn:mergeinfo
80	83	- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901,64881
81	84	+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:63549,63764,63897-63901,64881,64948
Property changes on: branches/REL1_16/phase3/includes/ConfEditor.php
___________________________________________________________________
Name: svn:mergeinfo
82	85	- /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,64881
83	86	+ /trunk/phase3/includes/ConfEditor.php:63549,63764,63897-63901,64881,64948
Index: branches/REL1_16/phase3/includes/DefaultSettings.php
—	—	@@ -1686,7 +1686,7 @@
1687	1687	* to ensure that client-side caches do not keep obsolete copies of global
1688	1688	* styles.
1689	1689	*/
1690		~~-$wgStyleVersion = '268';~~
	1690	+$wgStyleVersion = '269';
1691	1691
1692	1692
1693	1693	# Server-side caching:
Property changes on: branches/REL1_16/phase3/includes/specials
___________________________________________________________________
Name: svn:mergeinfo
1694	1694	- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881
1695	1695	+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881,64948
Property changes on: branches/REL1_16/phase3/includes
___________________________________________________________________
Name: svn:mergeinfo
1696	1696	- /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:63549,63764,63897-63901,64876,64881
1697	1697	+ /branches/REL1_15/phase3/includes:51646
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:63549,63764,63897-63901,64876,64881,64948
Index: branches/REL1_16/phase3/RELEASE-NOTES
—	—	@@ -56,6 +56,8 @@
57	57	* (bug 23148) Fixed a local path disclosure vulnerability in ImageMagick image
58	58	scaling, which was introduced in 1.16 beta 1.
59	59	* Improved error checking on installer.
	60	+* (bug 22970) Fixed a JavaScript error in the upload destination conflict
	61	+ check.
60	62
61	63	=== Changes since 1.16 beta 1 ===
62	64

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r64948	(bug 22970) Made upload.js compatible with FF<3.5.	btongminh	21:01, 11 April 2010

Status & tagging log

07:10, 29 June 2010 Tim Starling (talk | contribs) changed the status of r65683 [removed: new added: deferred]