| Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialUserlogin.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646 |
| /branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321 |
| /branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970 |
| /trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837,64844 |
| 2 | 2 | + /branches/REL1_15/phase3/includes/specials/SpecialUserlogin.php:51646 |
| /branches/sqlite/includes/specials/SpecialUserlogin.php:58211-58321 |
| /branches/wmf-deployment/includes/specials/SpecialUserlogin.php:53381,56967,60970 |
| /trunk/phase3/includes/specials/SpecialUserlogin.php:63045,63047,63490,63549,63764,63897-63901,64837,64844,64846 |
| Index: branches/wmf/1.16wmf4/includes/specials/SpecialUpload.php |
| — | — | @@ -231,7 +231,9 @@ |
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | # Add text to form |
| 235 | | - $form->addPreText( '<div id="uploadtext">' . wfMsgExt( 'uploadtext', 'parse' ) . '</div>'); |
| | 235 | + $form->addPreText( '<div id="uploadtext">' . |
| | 236 | + wfMsgExt( 'uploadtext', 'parse', array( $this->mDesiredDestName ) ) . |
| | 237 | + '</div>' ); |
| 236 | 238 | # Add upload error message |
| 237 | 239 | $form->addPreText( $message ); |
| 238 | 240 | |
| Property changes on: branches/wmf/1.16wmf4/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 239 | 241 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967,60970 |
| /trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64844 |
| 240 | 242 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967,60970 |
| /trunk/phase3/includes/specials:63045,63047,63549,63764,63897-63901,64844,64846 |