http://www.mediawiki.org/wiki/Special:Code/MediaWiki/65022
Revision: 65022 Author: catrope Date: 2010-04-14 12:53:06 +0000 (Wed, 14 Apr 2010) Log Message: ----------- 1.16wmf4: MFT r64948, r64957: fixes for upload form Modified Paths: -------------- branches/wmf/1.16wmf4/includes/DefaultSettings.php branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php branches/wmf/1.16wmf4/skins/common/upload.js Property Changed: ---------------- branches/wmf/1.16wmf4/includes/DefaultSettings.php Modified: branches/wmf/1.16wmf4/includes/DefaultSettings.php =================================================================== --- branches/wmf/1.16wmf4/includes/DefaultSettings.php 2010-04-14 12:51:58 UTC (rev 65021) +++ branches/wmf/1.16wmf4/includes/DefaultSettings.php 2010-04-14 12:53:06 UTC (rev 65022) @@ -1686,7 +1686,7 @@ * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '268'; +$wgStyleVersion = '270'; # Server-side caching: Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php ___________________________________________________________________ Modified: svn:mergeinfo - /branches/REL1_15/phase3/includes/DefaultSettings.php:51646 /branches/sqlite/includes/DefaultSettings.php:58211-58321 /branches/wmf-deployment/includes/DefaultSettings.php:53381,60970 /trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692 + /branches/REL1_15/phase3/includes/DefaultSettings.php:51646 /branches/sqlite/includes/DefaultSettings.php:58211-58321 /branches/wmf-deployment/includes/DefaultSettings.php:53381,60970 /trunk/phase3/includes/DefaultSettings.php:63549,63764,63897-63901,64692,64851,64856,64876,64892,64918,64948 Modified: branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php =================================================================== --- branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php 2010-04-14 12:51:58 UTC (rev 65021) +++ branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php 2010-04-14 12:53:06 UTC (rev 65022) @@ -937,6 +937,7 @@ 'id' => 'wpWatchthis', 'label-message' => 'watchthisupload', 'section' => 'options', + 'default' => $wgUser->getOption( 'watchcreations' ), ) ); } Modified: branches/wmf/1.16wmf4/skins/common/upload.js =================================================================== --- branches/wmf/1.16wmf4/skins/common/upload.js 2010-04-14 12:51:58 UTC (rev 65021) +++ branches/wmf/1.16wmf4/skins/common/upload.js 2010-04-14 12:53:06 UTC (rev 65022) @@ -43,17 +43,20 @@ // AJAX wpDestFile warnings if ( wgAjaxUploadDestCheck ) { + // Insert an event handler that fetches upload warnings when wpDestFile + // has been changed document.getElementById( 'wpDestFile' ).onchange = function ( e ) { wgUploadWarningObj.checkNow(this.value); }; + // Insert a row where the warnings will be displayed just below the + // wpDestFile row var optionsTable = document.getElementById( 'mw-htmlform-description' ).tBodies[0]; - var row = document.createElement( 'tr' ); + var row = optionsTable.insertRow( 1 ); var td = document.createElement( 'td' ); td.id = 'wpDestFile-warning'; td.colSpan = 2; row.appendChild( td ); - optionsTable.insertBefore( row, optionsTable.children[1] ); } if ( wgAjaxLicensePreview ) { _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs