| Index: trunk/phase3/maintenance/renderDump.php |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | * Callback function for each revision, turn into HTML and save |
| 60 | 60 | * @param $rev Revision |
| 61 | 61 | */ |
| 62 | | - private function handleRevision( $rev ) { |
| | 62 | + public function handleRevision( $rev ) { |
| 63 | 63 | $title = $rev->getTitle(); |
| 64 | 64 | if ( !$title ) { |
| 65 | 65 | $this->error( "Got bogus revision with null title!" ); |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | $this->outputDirectory, |
| 75 | 75 | $this->count, |
| 76 | 76 | $sanitized ); |
| 77 | | - $this->output( sprintf( $this->stderr, "%s\n", $filename, $display ) ); |
| | 77 | + $this->output( sprintf( "%s\n", $filename, $display ) ); |
| 78 | 78 | |
| 79 | 79 | // fixme (what?) |
| 80 | 80 | $user = new User(); |
| Index: trunk/phase3/includes/ImportXMLReader.php |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | * @param $title Title |
| 193 | 193 | */ |
| 194 | 194 | function pageCallback( $title ) { |
| 195 | | - if( is_callable( $this->mPageCallback ) ) { |
| | 195 | + if( isset( $this->mPageCallback ) ) { |
| 196 | 196 | call_user_func( $this->mPageCallback, $title ); |
| 197 | 197 | } |
| 198 | 198 | } |
| — | — | @@ -204,7 +204,7 @@ |
| 205 | 205 | * @param $successCount Int: number of revisions for which callback returned true |
| 206 | 206 | */ |
| 207 | 207 | private function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) { |
| 208 | | - if( is_callable( $this->mPageOutCallback ) ) { |
| | 208 | + if( isset( $this->mPageOutCallback ) ) { |
| 209 | 209 | call_user_func_array( $this->mPageOutCallback, |
| 210 | 210 | array( $title, $origTitle, $revisionCount, $successCount ) ); |
| 211 | 211 | } |
| — | — | @@ -215,7 +215,7 @@ |
| 216 | 216 | * @param $revision A WikiRevision object |
| 217 | 217 | */ |
| 218 | 218 | private function revisionCallback( $revision ) { |
| 219 | | - if ( is_callable( $this->mRevisionCallback ) ) { |
| | 219 | + if ( isset( $this->mRevisionCallback ) ) { |
| 220 | 220 | return call_user_func_array( $this->mRevisionCallback, |
| 221 | 221 | array( $revision, $this ) ); |
| 222 | 222 | } else { |
| — | — | @@ -228,7 +228,7 @@ |
| 229 | 229 | * @param $revision A WikiRevision object |
| 230 | 230 | */ |
| 231 | 231 | private function logItemCallback( $revision ) { |
| 232 | | - if ( is_callable( $this->mLogItemCallback ) ) { |
| | 232 | + if ( isset( $this->mLogItemCallback ) ) { |
| 233 | 233 | return call_user_func_array( $this->mLogItemCallback, |
| 234 | 234 | array( $revision, $this ) ); |
| 235 | 235 | } else { |