summaryrefslogtreecommitdiff
path: root/includes/Licenses.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /includes/Licenses.php
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'includes/Licenses.php')
-rw-r--r--includes/Licenses.php45
1 files changed, 28 insertions, 17 deletions
diff --git a/includes/Licenses.php b/includes/Licenses.php
index 8a06c6fc..ba504a99 100644
--- a/includes/Licenses.php
+++ b/includes/Licenses.php
@@ -1,14 +1,32 @@
<?php
/**
- * A License class for use on Special:Upload
+ * License selector for use on Special:Upload.
*
- * @ingroup SpecialPage
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup SpecialPage
* @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
* @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason
* @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
*/
+/**
+ * A License class for use on Special:Upload
+ */
class Licenses extends HTMLFormField {
/**
* @var string
@@ -34,7 +52,7 @@ class Licenses extends HTMLFormField {
public function __construct( $params ) {
parent::__construct( $params );
- $this->msg = empty( $params['licenses'] ) ? wfMsgForContent( 'licenses' ) : $params['licenses'];
+ $this->msg = empty( $params['licenses'] ) ? wfMessage( 'licenses' )->inContentLanguage()->plain() : $params['licenses'];
$this->selected = null;
$this->makeLicenses();
@@ -102,7 +120,7 @@ class Licenses extends HTMLFormField {
foreach ( $tagset as $key => $val )
if ( is_array( $val ) ) {
$this->html .= $this->outputOption(
- $this->msg( $key ), '',
+ $key, '',
array(
'disabled' => 'disabled',
'style' => 'color: GrayText', // for MSIE
@@ -112,7 +130,7 @@ class Licenses extends HTMLFormField {
$this->makeHtml( $val, $depth + 1 );
} else {
$this->html .= $this->outputOption(
- $this->msg( $val->text ), $val->template,
+ $val->text, $val->template,
array( 'title' => '{{' . $val->template . '}}' ),
$depth
);
@@ -120,13 +138,15 @@ class Licenses extends HTMLFormField {
}
/**
- * @param $text
+ * @param $message
* @param $value
* @param $attribs null
* @param $depth int
* @return string
*/
- protected function outputOption( $text, $value, $attribs = null, $depth = 0 ) {
+ protected function outputOption( $message, $value, $attribs = null, $depth = 0 ) {
+ $msgObj = $this->msg( $message );
+ $text = $msgObj->exists() ? $msgObj->text() : $message;
$attribs['value'] = $value;
if ( $value === $this->selected )
$attribs['selected'] = 'selected';
@@ -134,15 +154,6 @@ class Licenses extends HTMLFormField {
return str_repeat( "\t", $depth ) . Xml::element( 'option', $attribs, $val ) . "\n";
}
- /**
- * @param $str string
- * @return String
- */
- protected function msg( $str ) {
- $msg = wfMessage( $str );
- return $msg->exists() ? $msg->text() : $str;
- }
-
/**#@-*/
/**
@@ -164,7 +175,7 @@ class Licenses extends HTMLFormField {
public function getInputHTML( $value ) {
$this->selected = $value;
- $this->html = $this->outputOption( wfMsg( 'nolicense' ), '',
+ $this->html = $this->outputOption( wfMessage( 'nolicense' )->text(), '',
(bool)$this->selected ? null : array( 'selected' => 'selected' ) );
$this->makeHtml( $this->getLicenses() );