| Index: trunk/extensions/SemanticForms/specials/SF_UploadWindow2.php |
| — | — | @@ -383,6 +383,8 @@ |
| 384 | 384 | } |
| 385 | 385 | |
| 386 | 386 | $basename = str_replace( '_', ' ', $basename ); |
| | 387 | + // UTF8-decoding is needed for IE |
| | 388 | + $basename = utf8_decode( $basename ); |
| 387 | 389 | $output = ' <script type="text/javascript">' . "\n"; |
| 388 | 390 | if ( $this->mDelimiter == null ) { |
| 389 | 391 | $output .= <<<END |
| — | — | @@ -926,7 +928,7 @@ |
| 927 | 929 | 'section' => 'options', |
| 928 | 930 | ); |
| 929 | 931 | } |
| 930 | | - $descriptor['wpDestFileWarningAck'] = array( |
| | 932 | + $descriptor['DestFileWarningAck'] = array( |
| 931 | 933 | 'type' => 'hidden', |
| 932 | 934 | 'id' => 'wpDestFileWarningAck', |
| 933 | 935 | 'default' => $this->mDestWarningAck ? '1' : '', |
| — | — | @@ -1014,13 +1016,12 @@ |
| 1015 | 1017 | protected function addUploadJS( $autofill = true ) { |
| 1016 | 1018 | global $wgUseAjax, $wgAjaxUploadDestCheck, $wgAjaxLicensePreview; |
| 1017 | 1019 | global $wgStrictFileExtensions; |
| 1018 | | - global $wgEnableFirefogg, $wgEnableJS2system; |
| | 1020 | + global $wgEnableJS2system; |
| 1019 | 1021 | global $wgOut; |
| 1020 | 1022 | |
| 1021 | 1023 | $scriptVars = array( |
| 1022 | 1024 | 'wgAjaxUploadDestCheck' => $wgUseAjax && $wgAjaxUploadDestCheck, |
| 1023 | 1025 | 'wgAjaxLicensePreview' => $wgUseAjax && $wgAjaxLicensePreview, |
| 1024 | | - 'wgEnableFirefogg' => (bool)$wgEnableFirefogg, |
| 1025 | 1026 | 'wgUploadAutoFill' => (bool)$autofill && |
| 1026 | 1027 | // If we received mDestFile from the request, don't autofill |
| 1027 | 1028 | // the wpDestFile textbox |