Follow up r54225. DumpRenderer::handleRevision needs to be public in order to be...

Follow up r66267. Make WikiImporter use isset instead of is_callable, so errors like the above aren't silently ignored..
Remove wrong $this->stderr

diff --git a/includes/ImportXMLReader.php b/includes/ImportXMLReader.php
index 74183f3..29536ed 100644 (file)
--- a/includes/ImportXMLReader.php
+++ b/includes/ImportXMLReader.php
@@ -191,7 +191,7 @@ class WikiImporter {
         * @param $title Title
         */
        function pageCallback( $title ) {
-               if( is_callable( $this->mPageCallback ) ) {
+               if( isset( $this->mPageCallback ) ) {
                        call_user_func( $this->mPageCallback, $title );
                }
        }
@@ -204,7 +204,7 @@ class WikiImporter {
         * @param $successCount Int: number of revisions for which callback returned true
         */
        private function pageOutCallback( $title, $origTitle, $revisionCount, $successCount ) {
-               if( is_callable( $this->mPageOutCallback ) ) {
+               if( isset( $this->mPageOutCallback ) ) {
                        call_user_func_array( $this->mPageOutCallback,
                                array( $title, $origTitle, $revisionCount, $successCount ) );
                }
@@ -215,7 +215,7 @@ class WikiImporter {
         * @param $revision A WikiRevision object
         */
        private function revisionCallback( $revision ) {
-               if ( is_callable( $this->mRevisionCallback ) ) {
+               if ( isset( $this->mRevisionCallback ) ) {
                        return call_user_func_array( $this->mRevisionCallback,
                                        array( $revision, $this ) );
                } else {
@@ -228,7 +228,7 @@ class WikiImporter {
         * @param $revision A WikiRevision object
         */
        private function logItemCallback( $revision ) {
-               if ( is_callable( $this->mLogItemCallback ) ) {
+               if ( isset( $this->mLogItemCallback ) ) {
                        return call_user_func_array( $this->mLogItemCallback,
                                        array( $revision, $this ) );
                } else {

diff --git a/maintenance/renderDump.php b/maintenance/renderDump.php
index d24ce94..03a2582 100644 (file)
--- a/maintenance/renderDump.php
+++ b/maintenance/renderDump.php
@@ -58,7 +58,7 @@ class DumpRenderer extends Maintenance {
         * Callback function for each revision, turn into HTML and save
         * @param $rev Revision
         */
-       private function handleRevision( $rev ) {
+       public function handleRevision( $rev ) {
                $title = $rev->getTitle();
                if ( !$title ) {
                        $this->error( "Got bogus revision with null title!" );
@@ -73,7 +73,7 @@ class DumpRenderer extends Maintenance {
                        $this->outputDirectory,
                        $this->count,
                        $sanitized );
-               $this->output( sprintf( $this->stderr, "%s\n", $filename, $display ) );
+               $this->output( sprintf( "%s\n", $filename, $display ) );
 
                // fixme (what?)
                $user = new User();