r72164 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72163‎ | r72164 | r72165 >
Date:21:01, 1 September 2010
Author:demon
Status:ok
Tags:
Comment:
Fix author list duplication.
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/WebInstallerPage.php (modified) (history)
  • /trunk/phase3/includes/specials/SpecialVersion.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -66,7 +66,6 @@
6767 See the GNU General Public License for more details.
6868
6969 You should have received <doclink href=Copying>a copy of the GNU General Public License</doclink> along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. or [http://www.gnu.org/copyleft/gpl.html read it online].",
70 - 'config-authors' => 'MediaWiki is Copyright © 2001-2010 by Magnus Manske, Brion Vibber, Lee Daniel Crocker, Tim Starling, Erik Möller, Gabriel Wicke, Ævar Arnfjörð Bjarmason, Niklas Laxström, Domas Mituzas, Rob Church, Yuri Astrakhan, Aryeh Gregor, Aaron Schulz, Andrew Garrett, Raimond Spekking, Alexandre Emsenhuber, Siebrand Mazeland, Chad Horohoe and others.', // TODO: move this to core strings and use it in Special:Version, too?
7170 'config-sidebar' => "* [http://www.mediawiki.org MediaWiki home]
7271 * [http://www.mediawiki.org/wiki/Help:Contents User's Guide]
7372 * [http://www.mediawiki.org/wiki/Manual:Contents Administrator's Guide]
Index: trunk/phase3/includes/installer/WebInstallerPage.php
@@ -197,7 +197,8 @@
198198 $this->parent->output->addWikiText( wfMsgNoTrans( 'config-welcome' ) );
199199 $status = $this->parent->doEnvironmentChecks();
200200 if ( $status ) {
201 - $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright', wfMsg( 'config-authors' ) ) );
 201+ $this->parent->output->addWikiText( wfMsgNoTrans( 'config-copyright',
 202+ SpecialVersion::getCopyrightAndAuthorList() ) );
202203 $this->startForm();
203204 $this->endForm();
204205 }
Index: trunk/phase3/includes/specials/SpecialVersion.php
@@ -89,8 +89,7 @@
9090 // This text is always left-to-right.
9191 $ret .= '<div>';
9292 $ret .= "__NOTOC__
93 - " . wfMsg( 'version-poweredby-credits', date( 'Y' ),
94 - $wgLang->listToText( $authorList ) ) . "\n
 93+ " . self::getCopyrightAndAuthorList() . "\n
9594 " . wfMsg( 'version-license-info' );
9695 $ret .= '</div>';
9796
@@ -98,6 +97,26 @@
9998 }
10099
101100 /**
 101+ * Get the "Mediawiki is copyright 2001-20xx by lots of cool guys" text
 102+ *
 103+ * @return String
 104+ */
 105+ public static function getCopyrightAndAuthorList() {
 106+ global $wgLang;
 107+
 108+ $authorList = array( 'Magnus Manske', 'Brion Vibber', 'Lee Daniel Crocker',
 109+ 'Tim Starling', 'Erik Möller', 'Gabriel Wicke', 'Ævar Arnfjörð Bjarmason',
 110+ 'Niklas Laxström', 'Domas Mituzas', 'Rob Church', 'Yuri Astrakhan',
 111+ 'Aryeh Gregor', 'Aaron Schulz', 'Andrew Garrett', 'Raimond Spekking',
 112+ 'Alexandre Emsenhuber', 'Siebrand Mazeland', 'Chad Horohoe',
 113+ wfMsg( 'version-poweredby-others' )
 114+ );
 115+
 116+ return wfMsg( 'version-poweredby-credits', date( 'Y' ),
 117+ $wgLang->listToText( $authorList ) );
 118+ }
 119+
 120+ /**
102121 * Returns wiki text showing the third party software versions (apache, php, mysql).
103122 *
104123 * @return string

Follow-up revisions

RevisionCommit summaryAuthorDate
r72285Follow up r72164. The list was still there.platonides14:04, 3 September 2010

Status & tagging log