fix to show the source article name in log
authorRaimond Spekking <raymond@users.mediawiki.org>
Wed, 18 Jul 2007 12:33:15 +0000 (12:33 +0000)
committerRaimond Spekking <raymond@users.mediawiki.org>
Wed, 18 Jul 2007 12:33:15 +0000 (12:33 +0000)
includes/SpecialImport.php

index 6274d0a..36e0273 100644 (file)
@@ -74,7 +74,7 @@ function wfSpecialImport( $page = '' ) {
                        if( !is_null( $articleName ) ) {
                                $importer->setTargetArticleName( $articleName );
                        }
-                       $reporter = new ImportReporter( $importer, $isUpload, $interwiki );
+                       $reporter = new ImportReporter( $importer, $isUpload, $interwiki, $frompage );
 
                        $reporter->open();
                        $result = $importer->doImport();
@@ -175,11 +175,12 @@ function wfSpecialImport( $page = '' ) {
  * @addtogroup SpecialPage
  */
 class ImportReporter {
-       function __construct( $importer, $upload, $interwiki ) {
+       function __construct( $importer, $upload, $interwiki, $frompage ) {
                $importer->setPageOutCallback( array( $this, 'reportPage' ) );
                $this->mPageCount = 0;
                $this->mIsUpload = $upload;
                $this->mInterwiki = $interwiki;
+               $this->mFrompage = $frompage;
        }
 
        function open() {
@@ -209,8 +210,11 @@ class ImportReporter {
                                        $contentCount );
                                $log->addEntry( 'upload', $title, $detail );
                        } else {
-                               $interwiki = '[[:' . $this->mInterwiki . ':' .
-                                       $origTitle->getPrefixedText() . ']]';
+                               // Show the source article name in log
+                               $origin = $this->mFrompage != $origTitle->getPrefixedText()
+                                       ? $this->mFrompage
+                                       : $origTitle->getPrefixedText();
+                               $interwiki = '[[:' . $this->mInterwiki . ':' . $origin . ']]';
                                $detail = wfMsgForContent( 'import-logentry-interwiki-detail',
                                        $contentCount, $interwiki );
                                $log->addEntry( 'interwiki', $title, $detail );