| Index: trunk/extensions/ProofreadPage/ProofreadPage.php |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | function pr_navigation( $title ) { |
| 126 | 126 | global $pr_page_namespace, $pr_index_namespace; |
| 127 | 127 | |
| 128 | | - $err = array( '', '', '', '', '', array() ); |
| | 128 | + $err = array( '', '', '', '', '' ); |
| 129 | 129 | |
| 130 | 130 | $index_title = Title::newFromText( $title->pr_index_title ); |
| 131 | 131 | $imageTitle = Title::makeTitleSafe( NS_IMAGE, $index_title->getText() ); |
| — | — | @@ -158,13 +158,13 @@ |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | if ( !$index_title ) { |
| 162 | | - return array( '', $prev_url, $next_url, '', '', array() ) ; |
| | 162 | + return array( '', $prev_url, $next_url, '', '' ) ; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | $index_url = $index_title->getFullURL(); |
| 166 | 166 | |
| 167 | 167 | if ( !$index_title->exists() ) { |
| 168 | | - return array( $index_url, $prev_url, $next_url, '', '', array() ); |
| | 168 | + return array( $index_url, $prev_url, $next_url, '', '' ); |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | //if the index page exists, find current page number, previous and next pages |
| — | — | @@ -200,7 +200,7 @@ |
| 201 | 201 | $footer = str_replace( "{{{{$key}}}}", $val, $footer ); |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | | - return array( $index_url, $prev_url, $next_url, $header, $footer, $attributes ); |
| | 204 | + return array( $index_url, $prev_url, $next_url, $header, $footer ); |
| 205 | 205 | |
| 206 | 206 | } |
| 207 | 207 | |
| — | — | @@ -341,7 +341,7 @@ |
| 342 | 342 | $thumbURL = ''; |
| 343 | 343 | } |
| 344 | 344 | |
| 345 | | - list( $index_url, $prev_url, $next_url, $header, $footer, $attributes ) = pr_navigation( $wgTitle ); |
| | 345 | + list( $index_url, $prev_url, $next_url, $header, $footer ) = pr_navigation( $wgTitle ); |
| 346 | 346 | |
| 347 | 347 | $jsFile = htmlspecialchars( "$wgScriptPath/extensions/ProofreadPage/proofread.js?$wgProofreadPageVersion" ); |
| 348 | 348 | |
| — | — | @@ -354,11 +354,9 @@ |
| 355 | 355 | 'proofreadPageIndexURL' => $index_url, |
| 356 | 356 | 'proofreadPagePrevURL' => $prev_url, |
| 357 | 357 | 'proofreadPageNextURL' => $next_url, |
| 358 | | - ) + $attributes; |
| 359 | | - |
| 360 | | - $jsVars['proofreadPageHeader'] = $header; |
| 361 | | - $jsVars['proofreadPageFooter'] = $footer; |
| 362 | | - |
| | 358 | + 'proofreadPageHeader' => $header, |
| | 359 | + 'proofreadPageFooter' => $footer, |
| | 360 | + ); |
| 363 | 361 | $varScript = Skin::makeVariablesScript( $jsVars ); |
| 364 | 362 | |
| 365 | 363 | $out->addScript( <<<EOT |
| — | — | @@ -781,7 +779,7 @@ |
| 782 | 780 | //convert to page format |
| 783 | 781 | $username = $wgUser->getName(); |
| 784 | 782 | pr_load_index( $title ); |
| 785 | | - list( $index_url, $prev_url, $next_url, $header, $footer, $attributes ) = pr_navigation( $title ); |
| | 783 | + list( $index_url, $prev_url, $next_url, $header, $footer ) = pr_navigation( $title ); |
| 786 | 784 | $editpage->textbox1 = |
| 787 | 785 | "<noinclude>{{PageQuality|1|$username}}$header\n\n\n</noinclude>" |
| 788 | 786 | .$text."<noinclude>\n$footer</noinclude>"; |