http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98016
Revision: 98016
Author: mglaser
Date: 2011-09-24 19:31:13 +0000 (Sat, 24 Sep 2011)
Log Message:
-----------
* fixes bug 31078: tiff format should always return true for isMultiPage
Modified Paths:
--------------
trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
Modified: trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php
===================================================================
--- trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2011-09-24
19:16:20 UTC (rev 98015)
+++ trunk/extensions/PagedTiffHandler/PagedTiffHandler_body.php 2011-09-24
19:31:13 UTC (rev 98016)
@@ -42,12 +42,11 @@
return true;
}
+ /**
+ * Does the file format support multi-page documents?
+ */
function isMultiPage( $img ) {
- if ( !$img ) {
- return true;
- }
- $meta = unserialize( $img->metadata );
- return $meta['page_count'] > 1;
+ return true;
}
/**
Modified: trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
===================================================================
--- trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
2011-09-24 19:16:20 UTC (rev 98015)
+++ trunk/extensions/PagedTiffHandler/tests/PagedTiffHandlerTest.php
2011-09-24 19:31:13 UTC (rev 98016)
@@ -283,7 +283,7 @@
// isMultiPage
$this->assertTrue( $this->handler->isMultiPage(
$this->multipage_image ) );
- $this->assertFalse( $this->handler->isMultiPage(
$this->mhz_image ) );
+ $this->assertTrue( $this->handler->isMultiPage(
$this->mhz_image ) );
// formatMetadata
$formattedMetadata = $this->handler->formatMetadata(
$this->multipage_image );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
