Merge "resourceloader: Simplify isCompatible() parameter in startup.js"

[lhc/web/wiklou.git] / includes / export / DumpNamespaceFilter.php

diff --git a/includes/export/DumpNamespaceFilter.php b/includes/export/DumpNamespaceFilter.php
index 2b71db0..0b8afa2 100644 (file)
--- a/includes/export/DumpNamespaceFilter.php
+++ b/includes/export/DumpNamespaceFilter.php
@@ -50,8 +50,8 @@ class DumpNamespaceFilter extends DumpFilter {
                        "NS_PROJECT_TALK"   => NS_PROJECT_TALK,
                        "NS_FILE"           => NS_FILE,
                        "NS_FILE_TALK"      => NS_FILE_TALK,
-                       "NS_IMAGE"          => NS_IMAGE, // NS_IMAGE is an alias for NS_FILE
-                       "NS_IMAGE_TALK"     => NS_IMAGE_TALK,
+                       "NS_IMAGE"          => NS_FILE, // NS_IMAGE is an alias for NS_FILE
+                       "NS_IMAGE_TALK"     => NS_FILE_TALK,
                        "NS_MEDIAWIKI"      => NS_MEDIAWIKI,
                        "NS_MEDIAWIKI_TALK" => NS_MEDIAWIKI_TALK,
                        "NS_TEMPLATE"       => NS_TEMPLATE,
@@ -84,7 +84,7 @@ class DumpNamespaceFilter extends DumpFilter {
         * @param object $page
         * @return bool
         */
-       function pass( $page ) {
+       protected function pass( $page ) {
                $match = isset( $this->namespaces[$page->page_namespace] );
                return $this->invert xor $match;
        }