wikimedia/mediawiki-extensions-PdfHandler
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler synced 2024-11-14 19:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Couple of minor bits of code simplfication"

Browse source
This commit is contained in:
Aaron Schulz 2013-03-01 00:52:22 +00:00 committed by Gerrit Code Review
parent fe26b104c1 636de72aae
commit 35ec85244c
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
PdfHandler_body.php
View file

@ -61,10 +61,9 @@ class PdfHandler extends ImageHandler {
*/
function validateParam( $name, $value ) {
if ( in_array( $name, array( 'width', 'height', 'page' ) ) ) {
return ( $value <= 0 ) ? false : true;
} else {
return false;
return ( $value > 0 );
}
return false;
}
/**
@ -339,13 +338,7 @@ class PdfHandler extends ImageHandler {
*/
function getPageText( $image, $page ) {
$data = $this->getMetaArray( $image, true );
if ( !$data ) {
return false;
}
if( !isset( $data['text'] ) ) {
return false;
}
if( !isset( $data['text'][$page - 1] ) ) {
if ( !$data || !isset( $data['text'] ) || !isset( $data['text'][$page - 1] ) ) {
return false;
}
return $data['text'][$page - 1];