| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -2353,6 +2353,8 @@ |
| 2354 | 2354 | 'import-invalid-interwiki', |
| 2355 | 2355 | 'import-error-edit', |
| 2356 | 2356 | 'import-error-create', |
| | 2357 | + 'import-error-interwiki', |
| | 2358 | + 'import-error-special', |
| 2357 | 2359 | ), |
| 2358 | 2360 | 'importlog' => array( |
| 2359 | 2361 | 'importlogpage', |
| Index: trunk/phase3/includes/Import.php |
| — | — | @@ -782,9 +782,12 @@ |
| 783 | 783 | # Invalid page title? Ignore the page |
| 784 | 784 | $this->notice( "Skipping invalid page title '$workTitle'" ); |
| 785 | 785 | return false; |
| 786 | | - } elseif( $title->getInterwiki() != '' ) { |
| 787 | | - $this->notice( "Skipping interwiki page title '$workTitle'" ); |
| | 786 | + } elseif( $title->isExternal() ) { |
| | 787 | + $this->notice( wfMessage( 'import-error-interwiki', $title->getText() )->text() ); |
| 788 | 788 | return false; |
| | 789 | + } elseif( !$title->canExist() ) { |
| | 790 | + $this->notice( wfMessage( 'import-error-special', $title->getText() )->text() ); |
| | 791 | + return false; |
| 789 | 792 | } elseif( !$title->userCan( 'edit' ) && !$wgCommandLineMode ) { |
| 790 | 793 | # Do not import if the importing wiki user cannot edit this page |
| 791 | 794 | $this->notice( wfMessage( 'import-error-edit', $title->getText() )->text() ); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -3398,6 +3398,8 @@ |
| 3399 | 3399 | 'import-invalid-interwiki' => 'Cannot import from the specified wiki.', |
| 3400 | 3400 | 'import-error-edit' => 'Page "$1" is not imported because you are not allowed to edit it.', |
| 3401 | 3401 | 'import-error-create' => 'Page "$1" is not imported because you are not allowed to create it.', |
| | 3402 | +'import-error-interwiki' => 'Page "$1" is not imported because its name is reserved for external linking (interwiki).', |
| | 3403 | +'import-error-special' => 'Page "$1" is not imported because it belongs to a special namespace that does not allow pages.', |
| 3402 | 3404 | |
| 3403 | 3405 | # Import log |
| 3404 | 3406 | 'importlogpage' => 'Import log', |