| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -100,7 +100,7 @@ |
| 101 | 101 | * @return wiki text showing the third party software versions (apache, php, mysql). |
| 102 | 102 | */ |
| 103 | 103 | static function softwareInformation() { |
| 104 | | - global $wgUseImageMagick, $wgImageMagickConvertCommand; |
| | 104 | + global $wgUseImageMagick, $wgImageMagickConvertCommand, $wgDiff3, $wgDiff; |
| 105 | 105 | $dbr = wfGetDB( DB_SLAVE ); |
| 106 | 106 | |
| 107 | 107 | // Put the software in an array of form 'name' => 'version'. All messages should |
| — | — | @@ -111,6 +111,22 @@ |
| 112 | 112 | $software['[http://www.php.net/ PHP]'] = phpversion() . " (" . php_sapi_name() . ")"; |
| 113 | 113 | $software[$dbr->getSoftwareLink()] = $dbr->getServerVersion(); |
| 114 | 114 | |
| | 115 | + // Version information for diff3 |
| | 116 | + if ( file_exists( trim( $wgDiff3, '"' ) ) ) { |
| | 117 | + $swDiff3Info = self::execOutput( $wgDiff3 . ' -v' ); |
| | 118 | + $swDiff3Line = explode("\n",$swDiff3Info ,2); |
| | 119 | + $swDiff3Ver = $swDiff3Line[0]; |
| | 120 | + $software['[http://www.gnu.org/software/diffutils/diffutils.html diff3]'] = $swDiff3Ver; |
| | 121 | + } |
| | 122 | + |
| | 123 | + // Version information for diff |
| | 124 | + if ( file_exists( trim( $wgDiff, '"' ) ) ) { |
| | 125 | + $swDiffInfo = self::execOutput( $wgDiff . ' -v' ); |
| | 126 | + $swDiffLine = explode("\n",$swDiffInfo ,2); |
| | 127 | + $swDiffVer = $swDiffLine[0]; |
| | 128 | + $software['[http://www.gnu.org/software/diffutils/diffutils.html diff]'] = $swDiffVer; |
| | 129 | + } |
| | 130 | + |
| 115 | 131 | // Look for ImageMagick's version, if did not found, try to find the GD library version |
| 116 | 132 | if ( $wgUseImageMagick === true ) { |
| 117 | 133 | if ( file_exists( trim( $wgImageMagickConvertCommand, '"' ) ) ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -92,7 +92,7 @@ |
| 93 | 93 | * Added a PHP port of CDB (constant database), for improved local caching when |
| 94 | 94 | the DBA extension is not available. |
| 95 | 95 | * (bug 14611) Added support showing the version of the image thumbnailing |
| 96 | | - engine. |
| | 96 | + engine and diff/diff3 engine. |
| 97 | 97 | |
| 98 | 98 | === Bug fixes in 1.16 === |
| 99 | 99 | |