wfProfileIn( 'djvutxt' );
$cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ;
wfDebug( __METHOD__.": $cmd\n" );
- $txt = wfShellExec( $cmd, $retval );
+ $retval = '';
+ $txt = wfShellExec( $cmd, &$retval );
wfProfileOut( 'djvutxt' );
if( $retval == 0) {
# Get rid of invalid UTF-8, strip control characters
global $wgImageMagickConvertCommand;
$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
wfDebug( __METHOD__.": Running convert -version\n" );
- $return = wfShellExec( $cmd, $retval );
+ $retval = '';
+ $return = wfShellExec( $cmd, &$retval );
$x = preg_match('/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches);
if( $x != 1 ) {
wfDebug( __METHOD__.": ImageMagick version check failed\n" );
$cmd .= ' > ' . wfEscapeShellArg($dstPath) . ') 2>&1';
wfProfileIn( 'ddjvu' );
wfDebug( __METHOD__.": $cmd\n" );
- $err = wfShellExec( $cmd, $retval );
+ $retval = '';
+ $err = wfShellExec( $cmd, &$retval );
wfProfileOut( 'ddjvu' );
$removed = $this->removeBadFile( $dstPath, $retval );
public function rasterize( $srcPath, $dstPath, $width, $height ) {
global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath;
$err = false;
+ $retval = '';
if ( isset( $wgSVGConverters[$wgSVGConverter] ) ) {
$cmd = str_replace(
array( '$path/', '$width', '$height', '$input', '$output' ),
) . " 2>&1";
wfProfileIn( 'rsvg' );
wfDebug( __METHOD__.": $cmd\n" );
- $err = wfShellExec( $cmd, $retval );
+ $err = wfShellExec( $cmd, &$retval );
wfProfileOut( 'rsvg' );
}
$removed = $this->removeBadFile( $dstPath, $retval );
extract( $titlesAttrs[$i] );
if($textVariant != $titleText){
$variantTitle = Title::makeTitle( $ns, $textVariant );
- if( is_null( $variantTitle ) ) { continue; }
+ if( is_null( $variantTitle ) ) {
+ continue;
+ }
$linkBatch->addObj( $variantTitle );
$variantMap[$variantTitle->getPrefixedDBkey()][] = $key;
}
var $mMath; # User math preference (as integer)
var $mUserLang; # Language code of the User language.
var $mThumbSize; # Thumb size preferred by the user.
+ var $mCleanSignatures; #
var $mUser; # Stored user object, just used to initialise the skin
var $mIsPreview; # Parsing the page for a "preview" operation
function setExternalLinkTarget( $x ) { return wfSetVar( $this->mExternalLinkTarget, $x ); }
function setMath( $x ) { return wfSetVar( $this->mMath, $x ); }
function setUserLang( $x ) { return wfSetVar( $this->mUserLang, $x ); }
- function setThumbSize() { return wfSetVar( $this->mThumbSize, $x ); }
+ function setThumbSize( $x ) { return wfSetVar( $this->mThumbSize, $x ); }
function setIsPreview( $x ) { return wfSetVar( $this->mIsPreview, $x ); }
function setIsSectionPreview( $x ) { return wfSetVar( $this->mIsSectionPreview, $x ); }