diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/media/DjVu.php | |
parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) |
Update to MediaWiki 1.25.1
Diffstat (limited to 'includes/media/DjVu.php')
-rw-r--r-- | includes/media/DjVu.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php index daeb475f..1b0eb492 100644 --- a/includes/media/DjVu.php +++ b/includes/media/DjVu.php @@ -221,11 +221,9 @@ class DjVuHandler extends ImageHandler { $cmd .= " | {$wgDjvuPostProcessor}"; } $cmd .= ' > ' . wfEscapeShellArg( $dstPath ) . ') 2>&1'; - wfProfileIn( 'ddjvu' ); wfDebug( __METHOD__ . ": $cmd\n" ); $retval = ''; $err = wfShellExec( $cmd, $retval ); - wfProfileOut( 'ddjvu' ); $removed = $this->removeBadFile( $dstPath, $retval ); if ( $retval != 0 || $removed ) { @@ -266,6 +264,7 @@ class DjVuHandler extends ImageHandler { * * @param File $file The DjVu file in question * @return string XML metadata as a string. + * @throws MWException */ private function getUnserializedMetadata( File $file ) { $metadata = $file->getMetadata(); @@ -312,7 +311,6 @@ class DjVuHandler extends ImageHandler { return false; } - wfProfileIn( __METHOD__ ); wfSuppressWarnings(); try { @@ -338,7 +336,6 @@ class DjVuHandler extends ImageHandler { wfDebug( "Bogus multipage XML metadata on '{$image->getName()}'\n" ); } wfRestoreWarnings(); - wfProfileOut( __METHOD__ ); if ( $gettext ) { return $image->djvuTextTree; } else { |