dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Improve behavior of IP::toUnsigned on Windows"
[lhc/web/wiklou.git]
/
includes
/
media
/
DjVu.php
diff --git
a/includes/media/DjVu.php
b/includes/media/DjVu.php
index
a7aa82f
..
b9e89d9
100644
(file)
--- a/
includes/media/DjVu.php
+++ b/
includes/media/DjVu.php
@@
-246,24
+246,23
@@
class DjVuHandler extends ImageHandler {
$image->dejaMetaTree = false;
$image->djvuTextTree = false;
$tree = new SimpleXMLElement( $metadata );
$image->dejaMetaTree = false;
$image->djvuTextTree = false;
$tree = new SimpleXMLElement( $metadata );
- if( $tree->getName() == 'mw-djvu' ) {
- foreach( $tree->children() as $b ) {
- if( $b->getName() == 'DjVuTxt' ) {
+ if
( $tree->getName() == 'mw-djvu' ) {
+ foreach
( $tree->children() as $b ) {
+ if
( $b->getName() == 'DjVuTxt' ) {
$image->djvuTextTree = $b;
$image->djvuTextTree = $b;
- }
- elseif ( $b->getName() == 'DjVuXML' ) {
+ } elseif ( $b->getName() == 'DjVuXML' ) {
$image->dejaMetaTree = $b;
}
}
} else {
$image->dejaMetaTree = $tree;
}
$image->dejaMetaTree = $b;
}
}
} else {
$image->dejaMetaTree = $tree;
}
- } catch( Exception $e ) {
+ } catch
( Exception $e ) {
wfDebug( "Bogus multipage XML metadata on '{$image->getName()}'\n" );
}
wfRestoreWarnings();
wfProfileOut( __METHOD__ );
wfDebug( "Bogus multipage XML metadata on '{$image->getName()}'\n" );
}
wfRestoreWarnings();
wfProfileOut( __METHOD__ );
- if( $gettext ) {
+ if
( $gettext ) {
return $image->djvuTextTree;
} else {
return $image->dejaMetaTree;
return $image->djvuTextTree;
} else {
return $image->dejaMetaTree;