Revision: 48533
Author: demon
Date: 2009-03-18 20:36:11 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Cleanup to r48486:
* Make this disable-able by setting $wgDjvutext to null by default (commented)
* Use wfFindFile instead of deprecated Image::newFromTitle
* Only apply this when it's a djvu mime type
Modified Paths:
--------------
trunk/extensions/ProofreadPage/ProofreadPage.php
Modified: trunk/extensions/ProofreadPage/ProofreadPage.php
===================================================================
--- trunk/extensions/ProofreadPage/ProofreadPage.php 2009-03-18 20:26:20 UTC
(rev 48532)
+++ trunk/extensions/ProofreadPage/ProofreadPage.php 2009-03-18 20:36:11 UTC
(rev 48533)
@@ -14,7 +14,8 @@
$wgHooks['ArticleSaveComplete'][] = 'pr_articleSave';
$wgHooks['EditFormPreloadText'][] = 'pr_preloadText';
-$wgDjvutxt = 'djvutxt';
+# Allows for extracting text from djvu files. To enable, set to 'djvutxt' or
similar
+$wgDjvutxt = null;
$wgExtensionCredits['other'][] = array(
@@ -659,15 +660,15 @@
$page_namespace = preg_quote( wfMsgForContent(
'proofreadpage_namespace' ), '/' );
- if ( preg_match( "/^$page_namespace:(.*?)\/([0-9]*)$/",
$mTitle->getPrefixedText(), $m ) ) {
+ if ( $wgDjvutxt && preg_match( "/^$page_namespace:(.*?)\/([0-9]*)$/",
$mTitle->getPrefixedText(), $m ) ) {
$imageTitle = Title::makeTitleSafe( NS_IMAGE, $m[1] );
if ( !$imageTitle ) {
return true;
}
- $image = Image::newFromTitle( $imageTitle );
- if ( $image->exists() ) {
+ $image = wfFindFile( $title );
+ if ( $image->exists() && $image->getMimeType() ==
'image/vnd.djvu' ) {
$srcPath = $image->getPath();
$cmd = "( " .wfEscapeShellArg( $wgDjvutxt );
$cmd .= " --page {$m[2]} ". wfEscapeShellArg( $srcPath
)." )";
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
