* (bug 25135) add "normalized" to action=parse

Mov addition of $oldid earlier

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b658200..4fa6b17 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -70,6 +70,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 26558) list=allusers auprop=groups does not list groups a user is automatically a member of
 * (bug 26559) list=allusers auprop=rights does not match list=users usprop=rights
 * (bug 26560) On allusers if limit < total number of users, last user gets duplicate
+* (bug 25135) add "normalized" to action=parse
 
 === Languages updated in 1.18 ===
 

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 1a3956b..cbd5d0b 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -176,6 +176,13 @@ class ApiParse extends ApiBase {
                // Return result
                $result = $this->getResult();
                $result_array = array();
+
+               $result_array['title'] = $titleObj->getPrefixedText();
+
+               if ( !is_null( $oldid ) ) {
+                       $result_array['revid'] = intval( $oldid );
+               }
+
                if ( $params['redirects'] && !is_null( $redirValues ) ) {
                        $result_array['redirects'] = $redirValues;
                }
@@ -254,10 +261,6 @@ class ApiParse extends ApiBase {
                        $result_array['iwlinks'] = $this->formatIWLinks( $p_result->getInterwikiLinks() );
                }
 
-               if ( !is_null( $oldid ) ) {
-                       $result_array['revid'] = intval( $oldid );
-               }
-
                $result_mapping = array(
                        'redirects' => 'r',
                        'langlinks' => 'll',