| Index: trunk/phase3/includes/HttpFunctions.php |
| — | — | @@ -286,7 +286,7 @@ |
| 287 | 287 | $this->target_file_path = ( isset( $opt['target_file_path'] ) ) ? $opt['target_file_path'] : false; |
| 288 | 288 | $this->upload_session_key = ( isset( $opt['upload_session_key'] ) ) ? $opt['upload_session_key'] : false; |
| 289 | 289 | $this->headers_only = ( isset( $opt['headers_only'] ) ) ? $opt['headers_only'] : false; |
| 290 | | - $this->do_close_session_update = ( isset( $opt['do_close_session_update'] ) ) ? true : false; |
| | 290 | + $this->do_close_session_update = isset( $opt['do_close_session_update'] ); |
| 291 | 291 | } |
| 292 | 292 | |
| 293 | 293 | /** |
| — | — | @@ -519,7 +519,7 @@ |
| 520 | 520 | } |
| 521 | 521 | |
| 522 | 522 | public function callbackWriteBody( $ch, $data_packet ){ |
| 523 | | - global $wgMaxUploadSize; |
| | 523 | + global $wgMaxUploadSize, $wgLang; |
| 524 | 524 | |
| 525 | 525 | // write out the content |
| 526 | 526 | if( fwrite( $this->fp, $data_packet ) === false ){ |
| — | — | @@ -535,7 +535,7 @@ |
| 536 | 536 | if( $this->current_fsize > $wgMaxUploadSize ){ |
| 537 | 537 | wfDebug( __METHOD__ . " ::http download too large\n" ); |
| 538 | 538 | $this->status = Status::newFatal( 'HTTP::file-has-grown-beyond-upload-limit-killing: downloaded more than ' . |
| 539 | | - Language::formatSize( $wgMaxUploadSize ) . ' ' ); |
| | 539 | + $wgLang->formatSize( $wgMaxUploadSize ) . ' ' ); |
| 540 | 540 | return 0; |
| 541 | 541 | } |
| 542 | 542 | |