| Index: branches/REL1_15/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -1157,8 +1157,7 @@ |
| 1158 | 1158 | ); |
| 1159 | 1159 | if( $this->mForReUpload ) { |
| 1160 | 1160 | $wgOut->addHTML( |
| 1161 | | - "<input tabindex='2' type='hidden' name='wpDestFile' id='wpDestFile' |
| 1162 | | - value='{$encDestName}' />" . |
| | 1161 | + Xml::hidden( 'wpDestFile', $this->mDesiredDestName, array('id'=>'wpDestFile','tabindex'=>2) ) . |
| 1163 | 1162 | "<tt>" . |
| 1164 | 1163 | $encDestName . |
| 1165 | 1164 | "</tt>" |
| — | — | @@ -1167,7 +1166,7 @@ |
| 1168 | 1167 | else { |
| 1169 | 1168 | $wgOut->addHTML( |
| 1170 | 1169 | "<input tabindex='2' type='text' name='wpDestFile' id='wpDestFile' size='60' |
| 1171 | | - value='{$encDestName}' onchange='toggleFilenameFiller()' $destOnkeyup />" |
| | 1170 | + value=\"{$encDestName}\" onchange='toggleFilenameFiller()' $destOnkeyup />" |
| 1172 | 1171 | ); |
| 1173 | 1172 | } |
| 1174 | 1173 | |
| — | — | @@ -1254,7 +1253,8 @@ |
| 1255 | 1254 | <tr> |
| 1256 | 1255 | <td></td> |
| 1257 | 1256 | <td class='mw-input'> |
| 1258 | | - <input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\"" . $wgUser->getSkin()->tooltipAndAccesskey( 'upload' ) . " /> |
| | 1257 | + <input tabindex='9' type='submit' name='wpUpload' value=\"{$ulb}\"" . |
| | 1258 | + $wgUser->getSkin()->tooltipAndAccesskey( 'upload' ) . " /> |
| 1259 | 1259 | </td> |
| 1260 | 1260 | </tr> |
| 1261 | 1261 | <tr> |
| Property changes on: branches/REL1_15/phase3 |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1262 | 1262 | - /trunk/phase3:49068,49086 |
| 1263 | 1263 | + /trunk/phase3:49051,49068,49086,49775 |