summaryrefslogtreecommitdiff
path: root/includes/Metadata.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/Metadata.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/Metadata.php')
-rw-r--r--includes/Metadata.php32
1 files changed, 19 insertions, 13 deletions
diff --git a/includes/Metadata.php b/includes/Metadata.php
index e5e3296b..0ca15393 100644
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -1,21 +1,23 @@
<?php
/**
+ * Base code to format metadata.
*
* Copyright 2004, Evan Prodromou <evan@wikitravel.org>.
*
- * 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 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.
+ * 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
+ * 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
*
* @author Evan Prodromou <evan@wikitravel.org>
* @file
@@ -58,7 +60,7 @@ abstract class RdfMetaData {
global $wgLanguageCode, $wgSitename;
$this->element( 'title', $this->mArticle->getTitle()->getText() );
- $this->pageOrString( 'publisher', wfMsg( 'aboutpage' ), $wgSitename );
+ $this->pageOrString( 'publisher', wfMessage( 'aboutpage' )->text(), $wgSitename );
$this->element( 'language', $wgLanguageCode );
$this->element( 'type', 'Text' );
$this->element( 'format', 'text/html' );
@@ -115,14 +117,18 @@ abstract class RdfMetaData {
protected function person( $name, User $user ) {
if( $user->isAnon() ){
- $this->element( $name, wfMsgExt( 'anonymous', array( 'parsemag' ), 1 ) );
+ $this->element( $name, wfMessage( 'anonymous' )->numParams( 1 )->text() );
} else {
$real = $user->getRealName();
if( $real ) {
$this->element( $name, $real );
} else {
$userName = $user->getName();
- $this->pageOrString( $name, $user->getUserPage(), wfMsgExt( 'siteuser', 'parsemag', $userName, $userName ) );
+ $this->pageOrString(
+ $name,
+ $user->getUserPage(),
+ wfMessage( 'siteuser', $userName, $userName )->text()
+ );
}
}
}