From 9661f21b821b41feef22ca598fbf915248d088a9 Mon Sep 17 00:00:00 2001
From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 18 Sep 2009 15:24:00 +0000
Subject: [PATCH] * API: (bug 20700) Add amprop=default to list default
 messages in list=allmessages. This adds default="defaultmessagecontent" or
 defaultmissing="" to customized messages; non-customized messages get no
 extra attribute. * Don't parse magic words in messages returned by
 meta=allmessages , but output the message contents verbatim

---
 RELEASE-NOTES                        |  3 ++
 includes/api/ApiQueryAllmessages.php | 62 +++++++++++++++++-----------
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e5e9defc19..d804e1a0c1 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -560,6 +560,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   Access-Control-Allow-Origin HTTP header
 * (bug 19999) Made metadata and properties of search results optional. Added
   srprop and srinfo.
+* (bug 20700) Add amprop=default to meta=allmessages to list default value for
+  customized messages
+* Don't parse magic words in meta=allmessages, output messages unparsed
 
 === Languages updated in 1.16 ===
 
diff --git a/includes/api/ApiQueryAllmessages.php b/includes/api/ApiQueryAllmessages.php
index cb79f8fa3d..971c25187b 100644
--- a/includes/api/ApiQueryAllmessages.php
+++ b/includes/api/ApiQueryAllmessages.php
@@ -47,16 +47,17 @@ class ApiQueryAllmessages extends ApiQueryBase {
 			global $wgLang;
 			$wgLang = Language::factory($params['lang']);
 		}
-
+		
+		$prop = array_flip( (array)$params['prop'] );
 
 		//Determine which messages should we print
 		$messages_target = array();
-		if( $params['messages'] == '*' ) {
+		if( in_array( '*', $params['messages'] ) ) {
 			$message_names = array_keys( Language::getMessagesFor( 'en' ) );
 			sort( $message_names );
 			$messages_target = $message_names;
 		} else {
-			$messages_target = explode( '|', $params['messages'] );
+			$messages_target = $params['messages'];
 		}
 
 		//Filter messages
@@ -70,42 +71,52 @@ class ApiQueryAllmessages extends ApiQueryBase {
 			$messages_target = $messages_filtered;
 		}
 
-		//Get all requested messages
+		//Get all requested messages and print the result
 		$messages = array();
 		$skip = !is_null($params['from']);
+		$result = $this->getResult();
 		foreach( $messages_target as $message ) {
 			// Skip all messages up to $params['from']
 			if($skip && $message === $params['from'])
 				$skip = false;
-			if(!$skip)
-				$messages[$message] = wfMsg( $message );
-		}
-
-		//Print the result
-		$result = $this->getResult();
-		$messages_out = array();
-		foreach( $messages as $name => $value ) {
-			$message = array();
-			$message['name'] = $name;
-			if( wfEmptyMsg( $name, $value ) ) {
-				$message['missing'] = '';
-			} else {
-				$result->setContent( $message, $value );
-			}
-			$fit = $result->addValue(array('query', $this->getModuleName()), null, $message);
-			if(!$fit)
-			{
-				$this->setContinueEnumParameter('from', $name);
-				break;
+			if(!$skip) {
+				$a = array( 'name' => $message );
+				$msg = wfMsgGetKey( $message, true, false, false );
+				if ( wfEmptyMsg( $message, $msg ) )
+					$a['missing'] = '';
+				else {
+					ApiResult::setContent( $a, $msg );
+					if ( isset( $prop['default'] ) ) {
+						$default = wfMsgGetKey( $message, false, false, false );
+						if ( $default !== $msg ) {
+							if ( wfEmptyMsg( $message, $default ) )
+								$a['defaultmissing'] = '';
+							else
+								$a['default'] = $default;
+						}
+					}
+				}
+				$fit = $result->addValue( array( 'query', $this->getModuleName() ), null, $a );
+				if( !$fit ) {
+					$this->setContinueEnumParameter( 'from', $name );
+					break;
+				}
 			}
 		}
-		$result->setIndexedTagName_internal(array('query', $this->getModuleName()), 'message');
+		$result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'message' );
 	}
 
 	public function getAllowedParams() {
 		return array (
 			'messages' => array (
 				ApiBase :: PARAM_DFLT => '*',
+				ApiBase :: PARAM_ISMULTI => true,
+			),
+			'prop' => array(
+				ApiBase :: PARAM_ISMULTI => true,
+				ApiBase :: PARAM_TYPE => array(
+					'default'
+				)
 			),
 			'filter' => array(),
 			'lang' => null,
@@ -116,6 +127,7 @@ class ApiQueryAllmessages extends ApiQueryBase {
 	public function getParamDescription() {
 		return array (
 			'messages' => 'Which messages to output. "*" means all messages',
+			'prop' => 'Which properties to get',
 			'filter' => 'Return only messages that contain this string',
 			'lang' => 'Return messages in this language',
 			'from' => 'Return messages starting at this message',
-- 
2.20.1