Merge "ApiParse: Fix parse of new section title"

diff --combined includes/api/ApiParse.php
index b621861,6a87dce..73bea83
--- 1/includes/api/ApiParse.php
--- 2/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@@ -88,9 -88,6 +88,9 @@@ class ApiParse extends ApiBase 
                $result = $this->getResult();
  
                if ( !is_null( $oldid ) || !is_null( $pageid ) || !is_null( $page ) ) {
 +                      if ( $this->section === 'new' ) {
 +                                      $this->dieUsage( 'section=new cannot be combined with oldid, pageid or page parameters. Please use text', 'params' );
 +                      }
                        if ( !is_null( $oldid ) ) {
                                // Don't use the parser cache
                                $rev = Revision::newFromId( $oldid );
@@@ -231,12 -228,11 +231,11 @@@
                                        $result_array['wikitext'] = array();
                                        ApiResult::setContent( $result_array['wikitext'], $this->content->serialize( $format ) );
                                }
-                               if ( !is_null( $params['summary'] ) ) {
+                               if ( !is_null( $params['summary'] ) ||
+                                       ( !is_null( $params['sectiontitle'] ) && $this->section === 'new' )
+                               ) {
                                        $result_array['parsedsummary'] = array();
-                                       ApiResult::setContent(
-                                               $result_array['parsedsummary'],
-                                               Linker::formatComment( $params['summary'], $titleObj )
-                                       );
+                                       ApiResult::setContent( $result_array['parsedsummary'], $this->formatSummary( $titleObj, $params ) );
                                }
  
                                $result->addValue( null, $this->getModuleName(), $result_array );
@@@ -273,12 -269,11 +272,11 @@@
                        ApiResult::setContent( $result_array['text'], $p_result->getText() );
                }
  
-               if ( !is_null( $params['summary'] ) ) {
+               if ( !is_null( $params['summary'] ) ||
+                       ( !is_null( $params['sectiontitle'] ) && $this->section === 'new' )
+               ) {
                        $result_array['parsedsummary'] = array();
-                       ApiResult::setContent(
-                               $result_array['parsedsummary'],
-                               Linker::formatComment( $params['summary'], $titleObj )
-                       );
+                       ApiResult::setContent( $result_array['parsedsummary'], $this->formatSummary( $titleObj, $params ) );
                }
  
                if ( isset( $prop['langlinks'] ) ) {
@@@ -502,6 -497,30 +500,30 @@@
                return $section;
        }
  
+       /**
+        * This mimicks the behavior of EditPage in formatting a summary
+        *
+        * @param Title $title of the page being parsed
+        * @param Array $params the API parameters of the request
+        * @return Content|bool
+        */
+       private function formatSummary( $title, $params ) {
+               global $wgParser;
+               $summary = !is_null( $params['summary'] ) ? $params['summary'] : '';
+               $sectionTitle = !is_null( $params['sectiontitle'] ) ? $params['sectiontitle'] : '';
+ 
+               if ( $this->section === 'new' && ( $sectionTitle === '' || $summary === '' ) ) {
+                       if( $sectionTitle !== '' ) {
+                               $summary = $params['sectiontitle'];
+                       }
+                       if ( $summary !== '' ) {
+                               $summary = wfMessage( 'newsectionsummary' )->rawParams( $wgParser->stripSectionName( $summary ) )
+                                       ->inContentLanguage()->text();
+                       }
+               }
+               return Linker::formatComment( $summary, $title, $this->section === 'new' );
+       }
+ 
        private function formatLangLinks( $links ) {
                $result = array();
                foreach ( $links as $link ) {