| Index: branches/REL1_16/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -1003,7 +1003,10 @@ |
| 1004 | 1004 | $scriptVars = array( |
| 1005 | 1005 | 'wgAjaxUploadDestCheck' => $useAjaxDestCheck, |
| 1006 | 1006 | 'wgAjaxLicensePreview' => $useAjaxLicensePreview, |
| 1007 | | - 'wgUploadAutoFill' => !$this->mForReUpload, |
| | 1007 | + 'wgUploadAutoFill' => !$this->mForReUpload && |
| | 1008 | + // If we received mDestFile from the request, don't autofill |
| | 1009 | + // the wpDestFile textbox |
| | 1010 | + $this->mDestFile === '', |
| 1008 | 1011 | 'wgUploadSourceIds' => $this->mSourceIds, |
| 1009 | 1012 | ); |
| 1010 | 1013 | |
| Property changes on: branches/REL1_16/phase3/includes/specials/SpecialUpload.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1011 | 1014 | Merged /branches/wmf-deployment/includes/specials/SpecialUpload.php:r53381,56967 |
| 1012 | 1015 | Merged /branches/REL1_15/phase3/includes/specials/SpecialUpload.php:r51646 |
| 1013 | 1016 | Merged /branches/sqlite/includes/specials/SpecialUpload.php:r58211-58321 |
| 1014 | 1017 | Merged /trunk/phase3/includes/specials/SpecialUpload.php:r63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881,64948,64957,65025,65029,66944,68236 |
| Index: branches/REL1_16/phase3/RELEASE-NOTES |
| — | — | @@ -57,6 +57,8 @@ |
| 58 | 58 | * (bug 23597) Fixed conflicts between ID attributes in the Vector skin and |
| 59 | 59 | parser-generated heading IDs. Renamed head, panel, head-base and page-base. |
| 60 | 60 | * Disabled $wgHitcounterUpdateFreq>1 feature on SQLite, does not work yet. |
| | 61 | +* (bug 23465) Don't ignore the predefined destination filename on |
| | 62 | + Special:Upload after following a red link to a file. |
| 61 | 63 | |
| 62 | 64 | == Changes since 1.16 beta 2 == |
| 63 | 65 | |