| Index: branches/REL1_16/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -955,14 +955,14 @@ |
| 956 | 956 | ); |
| 957 | 957 | } |
| 958 | 958 | |
| 959 | | - $descriptor['DestFileWarningAck'] = array( |
| | 959 | + $descriptor['wpDestFileWarningAck'] = array( |
| 960 | 960 | 'type' => 'hidden', |
| 961 | 961 | 'id' => 'wpDestFileWarningAck', |
| 962 | 962 | 'default' => $this->mDestWarningAck ? '1' : '', |
| 963 | 963 | ); |
| 964 | 964 | |
| 965 | 965 | if ( $this->mForReUpload ) { |
| 966 | | - $descriptor['ForReUpload'] = array( |
| | 966 | + $descriptor['wpForReUpload'] = array( |
| 967 | 967 | 'type' => 'hidden', |
| 968 | 968 | 'id' => 'wpForReUpload', |
| 969 | 969 | 'default' => '1', |
| Property changes on: branches/REL1_16/phase3/includes/specials |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 970 | 970 | - /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881,64948,64957,65025 |
| 971 | 971 | + /branches/REL1_15/phase3/includes/specials:51646 |
| /branches/sqlite/includes/specials:58211-58321 |
| /branches/wmf-deployment/includes/specials:53381,56967 |
| /trunk/phase3/includes/specials:63045,63047,63490,63549,63764,63897-63901,64180,64837,64846,64860,64862,64881,64948,64957,65025,65029 |