| Index: trunk/phase3/maintenance/dumpTextPass.php |
| — | — | @@ -214,18 +214,13 @@ |
| 215 | 215 | $this->fetchCount++; |
| 216 | 216 | if ( isset( $this->prefetch ) ) { |
| 217 | 217 | $text = $this->prefetch->prefetch( $this->thisPage, $this->thisRev ); |
| 218 | | - if ( $text === null ) { |
| 219 | | - // Entry missing from prefetch dump |
| 220 | | - } elseif ( $text === "" ) { |
| 221 | | - // Blank entries may indicate that the prior dump was broken. |
| 222 | | - // To be safe, reload it. |
| 223 | | - } else { |
| | 218 | + if ( $text !== null ) { // Entry missing from prefetch dump |
| 224 | 219 | $dbr = wfGetDB( DB_SLAVE ); |
| 225 | | - $revID = intval($this->thisRev); |
| 226 | | - $revLength = $dbr->selectField( 'revision', 'rev_len', array('rev_id' => $revID ) ); |
| | 220 | + $revID = intval( $this->thisRev ); |
| | 221 | + $revLength = $dbr->selectField( 'revision', 'rev_len', array( 'rev_id' => $revID ) ); |
| 227 | 222 | // if length of rev text in file doesn't match length in db, we reload |
| 228 | 223 | // this avoids carrying forward broken data from previous xml dumps |
| 229 | | - if( strlen($text) == $revLength ) { |
| | 224 | + if( strlen( $text ) == $revLength ) { |
| 230 | 225 | $this->prefetchCount++; |
| 231 | 226 | return $text; |
| 232 | 227 | } |