diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2020-11-20 06:29:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2020-11-20 06:29:11 +0000 |
| commit | 29c1a731cf9f6a5b5fda6f1fc95b950d6d49f5f5 (patch) | |
| tree | 5cb8d186086400ed00174a71fa3ce56400538d07 /includes/import/WikiImporter.php | |
| parent | 00e0b402137ed211d07f3ed16bc8eda94e80f353 (diff) | |
| parent | 2defaa19ea42c2d56d3e8a8e192b9c65ea09d6b0 (diff) | |
| download | mediawikicore-29c1a731cf9f6a5b5fda6f1fc95b950d6d49f5f5.tar.gz mediawikicore-29c1a731cf9f6a5b5fda6f1fc95b950d6d49f5f5.zip | |
Merge "Simplify try-block and exception rethrow"
Diffstat (limited to 'includes/import/WikiImporter.php')
| -rw-r--r-- | includes/import/WikiImporter.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/includes/import/WikiImporter.php b/includes/import/WikiImporter.php index 43ed863cab29..56aec907c9ae 100644 --- a/includes/import/WikiImporter.php +++ b/includes/import/WikiImporter.php @@ -628,16 +628,9 @@ class WikiImporter { $keepReading = $this->reader->read(); } } - } catch ( Exception $ex ) { - $rethrow = $ex; - } - - // finally - libxml_disable_entity_loader( $oldDisable ); - $this->reader->close(); - - if ( $rethrow ) { - throw $rethrow; + } finally { + libxml_disable_entity_loader( $oldDisable ); + $this->reader->close(); } return true; |