Follow-up r67324: removed check for empty text since the length is checked explicitly
authorAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 4 Dec 2010 19:30:26 +0000 (19:30 +0000)
committerAlexandre Emsenhuber <ialex@users.mediawiki.org>
Sat, 4 Dec 2010 19:30:26 +0000 (19:30 +0000)
maintenance/dumpTextPass.php

index 6dcf660..dbd1177 100644 (file)
@@ -214,18 +214,13 @@ class TextPassDumper extends BackupDumper {
                $this->fetchCount++;
                if ( isset( $this->prefetch ) ) {
                        $text = $this->prefetch->prefetch( $this->thisPage, $this->thisRev );
-                       if ( $text === null ) {
-                               // Entry missing from prefetch dump
-                       } elseif ( $text === "" ) {
-                               // Blank entries may indicate that the prior dump was broken.
-                               // To be safe, reload it.
-                       } else {
+                       if ( $text !== null ) { // Entry missing from prefetch dump
                                $dbr = wfGetDB( DB_SLAVE );
-                               $revID = intval($this->thisRev);
-                               $revLength = $dbr->selectField( 'revision', 'rev_len', array('rev_id' => $revID ) );
+                               $revID = intval( $this->thisRev );
+                               $revLength = $dbr->selectField( 'revision', 'rev_len', array( 'rev_id' => $revID ) );
                                // if length of rev text in file doesn't match length in db, we reload
                                // this avoids carrying forward broken data from previous xml dumps
-                               if( strlen($text) == $revLength ) {
+                               if( strlen( $text ) == $revLength ) {
                                        $this->prefetchCount++;
                                        return $text;
                                }