| Index: branches/wmf/1.16wmf4/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 ) { |
| Index: branches/wmf/1.16wmf4/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 = '270'; |
| 1691 | 1691 | |
| 1692 | 1692 | |
| 1693 | 1693 | # Server-side caching: |
| Property changes on: branches/wmf/1.16wmf4/includes/DefaultSettings.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1694 | 1694 | - /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 |
| 1695 | 1695 | + /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 |
| Index: branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php |
| — | — | @@ -937,6 +937,7 @@ |
| 938 | 938 | 'id' => 'wpWatchthis', |
| 939 | 939 | 'label-message' => 'watchthisupload', |
| 940 | 940 | 'section' => 'options', |
| | 941 | + 'default' => $wgUser->getOption( 'watchcreations' ), |
| 941 | 942 | ) |
| 942 | 943 | ); |
| 943 | 944 | } |