Index: trunk/phase3/includes/SpecialVersion.php |
— | — | @@ -1,12 +1,12 @@ |
2 | 2 | <?php |
3 | 3 | /**#@+ |
4 | | - * Give information about the version of MediaWiki, PHP, the DB and extensions |
| 4 | + * Give information about the version of MediaWiki, PHP, server software, the DB and extensions |
5 | 5 | * |
6 | 6 | * @package MediaWiki |
7 | 7 | * @subpackage SpecialPage |
8 | 8 | * |
9 | | - * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com> |
10 | | - * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason |
| 9 | + * @authors Ævar Arnfjörð Bjarmason <avarab@gmail.com>, Rob Church <robchur@gmail.com> |
| 10 | + * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason, Rob Church |
11 | 11 | * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later |
12 | 12 | */ |
13 | 13 | |
— | — | @@ -29,7 +29,7 @@ |
30 | 30 | * Constructor |
31 | 31 | */ |
32 | 32 | function SpecialVersion() { |
33 | | - // English motherfucker, do you speak it? |
| 33 | + # Force to English language |
34 | 34 | $this->langObj = setupLangObj( 'LanguageEn' ); |
35 | 35 | $this->langObj->initEncoding(); |
36 | 36 | } |
— | — | @@ -84,12 +84,19 @@ |
85 | 85 | |
86 | 86 | * [http://www.mediawiki.org/ MediaWiki]: $wgVersion |
87 | 87 | * [http://www.php.net/ PHP]: " . phpversion() . " (" . php_sapi_name() . ") |
| 88 | + * " . $this->getServerSoftware() . " |
88 | 89 | * " . $dbr->getSoftwareLink() . ": " . $dbr->getServerVersion() . " |
89 | 90 | </div>"; |
90 | 91 | |
91 | 92 | return str_replace( "\t\t", '', $ret ); |
92 | 93 | } |
93 | 94 | |
| 95 | + function getServerSoftware() { |
| 96 | + # Return tweaked version of $_SERVER['SERVER_SOFTWARE'] |
| 97 | + $osver = explode( ' ', $_SERVER['SERVER_SOFTWARE'] ); |
| 98 | + return( count( $osver ) > 1 ? $osver[0] . ' ' . $osver[1] : $osver[0] ); |
| 99 | + } |
| 100 | + |
94 | 101 | function extensionCredits() { |
95 | 102 | global $wgExtensionCredits, $wgExtensionFunctions, $wgSkinExtensionFunction; |
96 | 103 | |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -368,8 +368,8 @@ |
369 | 369 | * (bug 4385) Separate parser cache entries for non-editing users, so section |
370 | 370 | edit links don't vanish / appear unwanted on protected pages |
371 | 371 | * (bug 2726, 3397) Fix [[Special:]] and [[:Image]] links in action=render |
| 372 | +* (bug 3794) Include OS / platform info in Special:Version |
372 | 373 | |
373 | | - |
374 | 374 | === Caveats === |
375 | 375 | |
376 | 376 | Some output, particularly involving user-supplied inline HTML, may not |