X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=blobdiff_plain;f=includes%2FImport.php;h=bd9ce25cbca53d98d8541d8d41c1826ecd08b28c;hb=ff0d8c153634da99c77efae15056c7a78ce5a044;hp=201746661b27b709a79ccf244ce070b051f2b4c4;hpb=bce969ea1803ba77ad4dfbdb2d5057a34c496d1e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Import.php b/includes/Import.php
index 201746661b..bd9ce25cbc 100644
--- a/includes/Import.php
+++ b/includes/Import.php
@@ -252,8 +252,16 @@ class WikiImporter {
 	 * @return bool
 	 */
 	public function importRevision( $revision ) {
-		$dbw = wfGetDB( DB_MASTER );
-		return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
+		try {
+			$dbw = wfGetDB( DB_MASTER );
+			return $dbw->deadlockLoop( array( $revision, 'importOldRevision' ) );
+		} catch ( MWContentSerializationException $ex ) {
+			$this->notice( 'import-error-unserialize',
+				$revision->getTitle()->getPrefixedText(),
+				$revision->getID(),
+				$revision->getModel(),
+				$revision->getFormat() );
+		}
 	}
 
 	/**