* Email subject in content language instead of sending user's UI language
* (bug 13251) Allow maintenance rebuild scripts to work with Postgres
* (bug 2084) Fixed incorrect regex to match redirects
+* (bug 3131) Manually-specified upload destination filename is no longer
+ overwritten by browsing for a file after you wrote it.
+
=== API changes in 1.13 ===
$adc = wfBoolToStr( $useAjaxDestCheck );
$alp = wfBoolToStr( $useAjaxLicensePreview );
+ $autofill = wfBoolToStr( $this->mDesiredDestName == '' );
$wgOut->addScript( "<script type=\"text/javascript\">
wgAjaxUploadDestCheck = {$adc};
wgAjaxLicensePreview = {$alp};
+wgUploadAutoFill = {$autofill};
</script>
<script type=\"text/javascript\" src=\"{$wgStylePath}/common/upload.js?{$wgStyleVersion}\"></script>
" );
"onfocus='" .
"toggle_element_activation(\"wpUploadFileURL\",\"wpUploadFile\");" .
"toggle_element_check(\"wpSourceTypeFile\",\"wpSourceTypeURL\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFile\")' ") . "size='60' />" .
+ "onchange='fillDestFilename(\"wpUploadFile\")' size='60' />" .
wfMsgHTML( 'upload_source_file' ) . "<br/>" .
"<input type='radio' id='wpSourceTypeURL' name='wpSourceType' value='web' " .
"onchange='toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\")' />" .
"onfocus='" .
"toggle_element_activation(\"wpUploadFile\",\"wpUploadFileURL\");" .
"toggle_element_check(\"wpSourceTypeURL\",\"wpSourceTypeFile\")'" .
- ($this->mDesiredDestName?"":"onchange='fillDestFilename(\"wpUploadFileURL\")' ") . "size='60' disabled='disabled' />" .
+ "onchange='fillDestFilename(\"wpUploadFileURL\")' size='60' disabled='disabled' />" .
wfMsgHtml( 'upload_source_url' ) ;
} else {
$filename_form =
<td align='$align1'><label for='wpDestFile'>{$destfilename}</label></td>
<td align='$align2'>
<input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60'
- value="$encDestName" $destOnkeyup />
+ value="$encDestName" onchange='toggleFilenameFiller()' $destOnkeyup />
</td>
</tr>
<tr>
}
function fillDestFilename(id) {
+ if (!wgUploadAutoFill) {
+ return;
+ }
if (!document.getElementById) {
return;
}
}
}
+function toggleFilenameFiller() {
+ if(!document.getElementById) return;
+ var upfield = document.getElementById('wpUploadFile');
+ var destName = document.getElementById('wpDestFile').value;
+ if (destName=='' || destName==' ') {
+ wgUploadAutoFill = true;
+ } else {
+ wgUploadAutoFill = false;
+ }
+}
+
var wgUploadLicenseObj = {
'responseCache' : { '' : '' },