| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | $this->setHeaders(); |
| 314 | 314 | $wgOut->setPageTitle( wfMsg( 'coll-book_creator' ) ); |
| 315 | 315 | |
| 316 | | - $wgOut->addWikiMsg( 'coll-book_creator_intro' ); |
| | 316 | + $wgOut->addWikiMsg( 'coll-book_creator_intro' ); |
| 317 | 317 | |
| 318 | 318 | $wgOut->addModules( 'ext.collection.checkLoadFromLocalStorage' ); |
| 319 | 319 | |
| — | — | @@ -393,7 +393,7 @@ |
| 394 | 394 | |
| 395 | 395 | $this->setHeaders(); |
| 396 | 396 | $wgOut->setPageTitle( wfMsg( 'coll-book_creator_disable' ) ); |
| 397 | | - $wgOut->addWikiMsg( 'coll-book_creator_disable_text' ); |
| | 397 | + $wgOut->addWikiMsg( 'coll-book_creator_disable_text' ); |
| 398 | 398 | |
| 399 | 399 | $wgOut->addHTML( |
| 400 | 400 | Xml::tags( 'form', |
| — | — | @@ -1059,9 +1059,11 @@ |
| 1060 | 1060 | } |
| 1061 | 1061 | |
| 1062 | 1062 | $template = new CollectionRenderingTemplate(); |
| 1063 | | - $template->set( 'status', $status ); |
| 1064 | | - if ( !isset( $response['status']['progress'] ) ) $response['status']['progress'] = 1.00; |
| 1065 | | - $template->set( 'progress', $response['status']['progress'] ); |
| | 1063 | + $template->set( 'status', $status ); |
| | 1064 | + if ( !isset( $response['status']['progress'] ) ) { |
| | 1065 | + $response['status']['progress'] = 1.00; |
| | 1066 | + } |
| | 1067 | + $template->set( 'progress', $response['status']['progress'] ); |
| 1066 | 1068 | $wgOut->addTemplate( $template ); |
| 1067 | 1069 | break; |
| 1068 | 1070 | case 'finished': |
| — | — | @@ -1092,18 +1094,18 @@ |
| 1093 | 1095 | |
| 1094 | 1096 | $info = false; |
| 1095 | 1097 | if ( isset( $r['url'] ) ) { |
| 1096 | | - $result = Http::get( $r['url'] ); |
| 1097 | | - if ($result) { |
| 1098 | | - fwrite($tempfile, $result); |
| 1099 | | - $info = true; |
| | 1098 | + $result = Http::get( $r['url'] ); |
| | 1099 | + if ($result) { |
| | 1100 | + fwrite($tempfile, $result); |
| | 1101 | + $info = true; |
| 1100 | 1102 | } |
| 1101 | 1103 | $content_type = $r['content_type']; |
| 1102 | 1104 | $content_length = $r['content_length']; |
| 1103 | 1105 | $content_disposition = $r['content_disposition']; |
| 1104 | 1106 | } else { |
| 1105 | 1107 | $info = self::mwServeCommand( 'download', array( |
| 1106 | | - 'collection_id' => $wgRequest->getVal( 'collection_id' ), |
| 1107 | | - 'writer' => $wgRequest->getVal( 'writer' ), |
| | 1108 | + 'collection_id' => $wgRequest->getVal( 'collection_id' ), |
| | 1109 | + 'writer' => $wgRequest->getVal( 'writer' ), |
| 1108 | 1110 | ) ); |
| 1109 | 1111 | $content_type = $info['content_type']; |
| 1110 | 1112 | $content_length = $info['download_content_length']; |