| Index: trunk/phase3/includes/parser/LinkHolderArray.php |
| — | — | @@ -345,7 +345,9 @@ |
| 346 | 346 | extract( $titlesAttrs[$i] ); |
| 347 | 347 | if($textVariant != $titleText){ |
| 348 | 348 | $variantTitle = Title::makeTitle( $ns, $textVariant ); |
| 349 | | - if( is_null( $variantTitle ) ) { continue; } |
| | 349 | + if( is_null( $variantTitle ) ) { |
| | 350 | + continue; |
| | 351 | + } |
| 350 | 352 | $linkBatch->addObj( $variantTitle ); |
| 351 | 353 | $variantMap[$variantTitle->getPrefixedDBkey()][] = $key; |
| 352 | 354 | } |
| Index: trunk/phase3/includes/parser/ParserOptions.php |
| — | — | @@ -38,6 +38,7 @@ |
| 39 | 39 | var $mMath; # User math preference (as integer) |
| 40 | 40 | var $mUserLang; # Language code of the User language. |
| 41 | 41 | var $mThumbSize; # Thumb size preferred by the user. |
| | 42 | + var $mCleanSignatures; # |
| 42 | 43 | |
| 43 | 44 | var $mUser; # Stored user object, just used to initialise the skin |
| 44 | 45 | var $mIsPreview; # Parsing the page for a "preview" operation |
| — | — | @@ -134,7 +135,7 @@ |
| 135 | 136 | function setExternalLinkTarget( $x ) { return wfSetVar( $this->mExternalLinkTarget, $x ); } |
| 136 | 137 | function setMath( $x ) { return wfSetVar( $this->mMath, $x ); } |
| 137 | 138 | function setUserLang( $x ) { return wfSetVar( $this->mUserLang, $x ); } |
| 138 | | - function setThumbSize() { return wfSetVar( $this->mThumbSize, $x ); } |
| | 139 | + function setThumbSize( $x ) { return wfSetVar( $this->mThumbSize, $x ); } |
| 139 | 140 | |
| 140 | 141 | function setIsPreview( $x ) { return wfSetVar( $this->mIsPreview, $x ); } |
| 141 | 142 | function setIsSectionPreview( $x ) { return wfSetVar( $this->mIsSectionPreview, $x ); } |
| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -362,7 +362,8 @@ |
| 363 | 363 | global $wgImageMagickConvertCommand; |
| 364 | 364 | $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version'; |
| 365 | 365 | wfDebug( __METHOD__.": Running convert -version\n" ); |
| 366 | | - $return = wfShellExec( $cmd, $retval ); |
| | 366 | + $retval = ''; |
| | 367 | + $return = wfShellExec( $cmd, &$retval ); |
| 367 | 368 | $x = preg_match('/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches); |
| 368 | 369 | if( $x != 1 ) { |
| 369 | 370 | wfDebug( __METHOD__.": ImageMagick version check failed\n" ); |
| Index: trunk/phase3/includes/media/SVG.php |
| — | — | @@ -82,6 +82,7 @@ |
| 83 | 83 | public function rasterize( $srcPath, $dstPath, $width, $height ) { |
| 84 | 84 | global $wgSVGConverters, $wgSVGConverter, $wgSVGConverterPath; |
| 85 | 85 | $err = false; |
| | 86 | + $retval = ''; |
| 86 | 87 | if ( isset( $wgSVGConverters[$wgSVGConverter] ) ) { |
| 87 | 88 | $cmd = str_replace( |
| 88 | 89 | array( '$path/', '$width', '$height', '$input', '$output' ), |
| — | — | @@ -94,7 +95,7 @@ |
| 95 | 96 | ) . " 2>&1"; |
| 96 | 97 | wfProfileIn( 'rsvg' ); |
| 97 | 98 | wfDebug( __METHOD__.": $cmd\n" ); |
| 98 | | - $err = wfShellExec( $cmd, $retval ); |
| | 99 | + $err = wfShellExec( $cmd, &$retval ); |
| 99 | 100 | wfProfileOut( 'rsvg' ); |
| 100 | 101 | } |
| 101 | 102 | $removed = $this->removeBadFile( $dstPath, $retval ); |
| Index: trunk/phase3/includes/media/DjVu.php |
| — | — | @@ -108,7 +108,8 @@ |
| 109 | 109 | $cmd .= ' > ' . wfEscapeShellArg($dstPath) . ') 2>&1'; |
| 110 | 110 | wfProfileIn( 'ddjvu' ); |
| 111 | 111 | wfDebug( __METHOD__.": $cmd\n" ); |
| 112 | | - $err = wfShellExec( $cmd, $retval ); |
| | 112 | + $retval = ''; |
| | 113 | + $err = wfShellExec( $cmd, &$retval ); |
| 113 | 114 | wfProfileOut( 'ddjvu' ); |
| 114 | 115 | |
| 115 | 116 | $removed = $this->removeBadFile( $dstPath, $retval ); |
| Index: trunk/phase3/includes/DjVuImage.php |
| — | — | @@ -248,7 +248,8 @@ |
| 249 | 249 | wfProfileIn( 'djvutxt' ); |
| 250 | 250 | $cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ; |
| 251 | 251 | wfDebug( __METHOD__.": $cmd\n" ); |
| 252 | | - $txt = wfShellExec( $cmd, $retval ); |
| | 252 | + $retval = ''; |
| | 253 | + $txt = wfShellExec( $cmd, &$retval ); |
| 253 | 254 | wfProfileOut( 'djvutxt' ); |
| 254 | 255 | if( $retval == 0) { |
| 255 | 256 | # Get rid of invalid UTF-8, strip control characters |