Merge "Use 'flush' flag to end automatic transactions."

diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt
index 5a63460..899554a 100644 (file)
--- a/docs/contenthandler.txt
+++ b/docs/contenthandler.txt
@@ -131,7 +131,7 @@ Page content is stored in the database using the same mechanism as before. Non-t
 appropriate serialization and deserialization is handled by the Revision class.
 
 Each revision's content model and serialization format is stored in the revision table (resp. in the archive table, if
-the revision was deleted). The page's (current) content model (that is, the conent model of the latest revision) is also
+the revision was deleted). The page's (current) content model (that is, the content model of the latest revision) is also
 stored in the page table.
 
 Note however that the content model and format is only stored if it differs from the page's default, as determined by

diff --git a/includes/site/MediaWikiSite.php b/includes/site/MediaWikiSite.php
index b05c421..71a17c8 100644 (file)
--- a/includes/site/MediaWikiSite.php
+++ b/includes/site/MediaWikiSite.php
@@ -124,7 +124,12 @@ class MediaWikiSite extends SiteObject {
                $page = static::extractPageRecord( $data, $pageName );
 
                if ( isset( $page['missing'] ) ) {
-                       wfDebugLog( "MediaWikiSite", "call to <$url> returned a missing page title! " . $ret );
+                       wfDebugLog( "MediaWikiSite", "call to <$url> returned a marker for a missing page title! " . $ret );
+                       return false;
+               }
+
+               if ( isset( $page['invalid'] ) ) {
+                       wfDebugLog( "MediaWikiSite", "call to <$url> returned a marker for an invalid page title! " . $ret );
                        return false;
                }