| Index: trunk/phase3/includes/upload/UploadFromStash.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | /* |
| 29 | 29 | * some $na vars for uploadBase method compatibility. |
| 30 | 30 | */ |
| 31 | | - public function initialize( $name, $sessionData, $na, $na2=false ) { |
| | 31 | + public function initialize( $name, $sessionData, $na=false, $na2=false ) { |
| 32 | 32 | /** |
| 33 | 33 | * Confirming a temporarily stashed upload. |
| 34 | 34 | * We don't want path names to be forged, so we keep |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -887,7 +887,7 @@ |
| 888 | 888 | * @param bool $autofill Whether or not to autofill the destination |
| 889 | 889 | * filename text box |
| 890 | 890 | */ |
| 891 | | - protected function addUploadJS( $autofill = true ) { |
| | 891 | + protected function addUploadJS( ) { |
| 892 | 892 | global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview; |
| 893 | 893 | global $wgEnableFirefogg, $wgEnableJS2system; |
| 894 | 894 | global $wgOut; |
| — | — | @@ -899,7 +899,7 @@ |
| 900 | 900 | 'wgAjaxUploadDestCheck' => $wgUseAjax && $wgAjaxUploadDestCheck, |
| 901 | 901 | 'wgAjaxLicensePreview' => $wgUseAjax && $wgAjaxLicensePreview, |
| 902 | 902 | 'wgEnableFirefogg' => (bool)$wgEnableFirefogg, |
| 903 | | - 'wgUploadAutoFill' => (bool)$autofill, |
| | 903 | + 'wgUploadAutoFill' => !$this->mForReUpload, |
| 904 | 904 | 'wgUploadSourceIds' => $this->mSourceIds, |
| 905 | 905 | ); |
| 906 | 906 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -2683,7 +2683,7 @@ |
| 2684 | 2684 | 'protectexpiry' => 'Expires:', |
| 2685 | 2685 | 'protect_expiry_invalid' => 'Expiry time is invalid.', |
| 2686 | 2686 | 'protect_expiry_old' => 'Expiry time is in the past.', |
| 2687 | | -'protect-unchain' => 'Unlock move permissions', |
| | 2687 | +'protect-unchain-permissions' => 'Unlock further protect options', |
| 2688 | 2688 | 'protect-text' => "You may view and change the protection level here for the page '''<nowiki>$1</nowiki>'''.", |
| 2689 | 2689 | 'protect-locked-blocked' => "You cannot change protection levels while blocked. |
| 2690 | 2690 | Here are the current settings for the page '''$1''':", |