| Index: trunk/phase3/maintenance/tests/UploadFromUrlTestSuite.php |
| — | — | @@ -46,7 +46,7 @@ |
| 47 | 47 | $parserMemc =& wfGetParserCacheStorage(); |
| 48 | 48 | |
| 49 | 49 | //$wgContLang = new StubContLang; |
| 50 | | - $wgUser = new User; |
| | 50 | + $wgUser = new StubUser; |
| 51 | 51 | $wgLang = new StubUserLang; |
| 52 | 52 | $wgOut = new StubObject( 'wgOut', 'OutputPage' ); |
| 53 | 53 | $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) ); |
| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -3137,8 +3137,6 @@ |
| 3138 | 3138 | 'version-version', |
| 3139 | 3139 | 'version-svn-revision', |
| 3140 | 3140 | 'version-license', |
| 3141 | | - 'version-poweredby-credits', |
| 3142 | | - 'version-license-info', |
| 3143 | 3141 | 'version-software', |
| 3144 | 3142 | 'version-software-product', |
| 3145 | 3143 | 'version-software-version', |
| Index: trunk/phase3/includes/specials/SpecialVersion.php |
| — | — | @@ -70,22 +70,33 @@ |
| 71 | 71 | * @return string |
| 72 | 72 | */ |
| 73 | 73 | private static function getMediaWikiCredits() { |
| 74 | | - global $wgLang; |
| 75 | | - |
| 76 | | - $authorList = array( 'Magnus Manske', 'Brion Vibber', 'Lee Daniel Crocker', |
| 77 | | - 'Tim Starling', 'Erik Möller', 'Gabriel Wicke', 'Ævar Arnfjörð Bjarmason', |
| 78 | | - 'Niklas Laxström', 'Domas Mituzas', 'Rob Church', 'Yuri Astrakhan', |
| 79 | | - 'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett', 'Raimond Spekking', |
| 80 | | - 'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe', 'others' |
| 81 | | - ); |
| 82 | 74 | $ret = Xml::element( 'h2', array( 'id' => 'mw-version-license' ), wfMsg( 'version-license' ) ); |
| 83 | 75 | |
| 84 | 76 | // This text is always left-to-right. |
| 85 | | - $ret .= '<div>'; |
| | 77 | + $ret .= '<div dir="ltr">'; |
| 86 | 78 | $ret .= "__NOTOC__ |
| 87 | | - " . wfMsg( 'version-poweredby-credits', date( 'Y' ), |
| 88 | | - $wgLang->listToText( $authorList ) ) . "\n |
| 89 | | - " . wfMsg( 'version-license-info' ); |
| | 79 | + This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''', |
| | 80 | + copyright © 2001-2010 Magnus Manske, Brion Vibber, Lee Daniel Crocker, |
| | 81 | + Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, |
| | 82 | + Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, |
| | 83 | + Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber, |
| | 84 | + Siebrand Mazeland, Chad Horohoe and others. |
| | 85 | + |
| | 86 | + MediaWiki is free software; you can redistribute it and/or modify |
| | 87 | + it under the terms of the GNU General Public License as published by |
| | 88 | + the Free Software Foundation; either version 2 of the License, or |
| | 89 | + (at your option) any later version. |
| | 90 | + |
| | 91 | + MediaWiki is distributed in the hope that it will be useful, |
| | 92 | + but WITHOUT ANY WARRANTY; without even the implied warranty of |
| | 93 | + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| | 94 | + GNU General Public License for more details. |
| | 95 | + |
| | 96 | + You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public License] |
| | 97 | + along with this program; if not, write to the Free Software |
| | 98 | + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| | 99 | + or [http://www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online]. |
| | 100 | + "; |
| 90 | 101 | $ret .= '</div>'; |
| 91 | 102 | |
| 92 | 103 | return str_replace( "\t\t", '', $ret ) . "\n"; |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -4242,22 +4242,6 @@ |
| 4243 | 4243 | 'version-version' => '(Version $1)', |
| 4244 | 4244 | 'version-svn-revision' => '(r$2)', # only translate this message to other languages if you have to change it |
| 4245 | 4245 | 'version-license' => 'License', |
| 4246 | | -'version-poweredby-credits' => "This wiki is powered by '''[http://www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.", // $1 is the current year, $2 is the list of authors |
| 4247 | | -'version-license-info' => "MediaWiki is free software; you can redistribute it and/or modify |
| 4248 | | - it under the terms of the GNU General Public License as published by |
| 4249 | | - the Free Software Foundation; either version 2 of the License, or |
| 4250 | | - (at your option) any later version. |
| 4251 | | - |
| 4252 | | - MediaWiki is distributed in the hope that it will be useful, |
| 4253 | | - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 4254 | | - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 4255 | | - GNU General Public License for more details. |
| 4256 | | - |
| 4257 | | - You should have received [{{SERVER}}{{SCRIPTPATH}}/COPYING a copy of the GNU General Public License] |
| 4258 | | - along with this program; if not, write to the Free Software |
| 4259 | | - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA |
| 4260 | | - or [http://www.gnu.org/licenses/old-licenses/gpl-2.0.html read it online]. |
| 4261 | | - ", |
| 4262 | 4246 | 'version-software' => 'Installed software', |
| 4263 | 4247 | 'version-software-product' => 'Product', |
| 4264 | 4248 | 'version-software-version' => 'Version', |