http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61754

Revision: 61754
Author:   reedy
Date:     2010-01-31 20:59:50 +0000 (Sun, 31 Jan 2010)

Log Message:
-----------
bug 18427 - Parsed comment on prop=revision

Modified Paths:
--------------
    trunk/phase3/includes/api/ApiQueryRevisions.php

Modified: trunk/phase3/includes/api/ApiQueryRevisions.php
===================================================================
--- trunk/phase3/includes/api/ApiQueryRevisions.php     2010-01-31 20:01:53 UTC 
(rev 61753)
+++ trunk/phase3/includes/api/ApiQueryRevisions.php     2010-01-31 20:59:50 UTC 
(rev 61754)
@@ -42,7 +42,7 @@
        }
 
        private $fld_ids = false, $fld_flags = false, $fld_timestamp = false, 
$fld_size = false,
-                       $fld_comment = false, $fld_user = false, $fld_content = 
false, $fld_tags = false;
+                       $fld_comment = false, $fld_parsedcomment = false, 
$fld_user = false, $fld_content = false, $fld_tags = false;
 
        protected function getTokenFunctions() {
                // tokenname => function
@@ -137,6 +137,7 @@
                $this->fld_flags = isset ( $prop['flags'] );
                $this->fld_timestamp = isset ( $prop['timestamp'] );
                $this->fld_comment = isset ( $prop['comment'] );
+               $this->fld_parsedcomment = isset ( $prop['parsedcomment'] );
                $this->fld_size = isset ( $prop['size'] );
                $this->fld_user = isset ( $prop['user'] );
                $this->token = $params['token'];
@@ -359,13 +360,21 @@
                        $vals['size'] = intval( $revision->getSize() );
                }
 
-               if ( $this->fld_comment ) {
+               if ( $this->fld_comment || $this->fld_parsedcomment ) {
                        if ( $revision->isDeleted( Revision::DELETED_COMMENT ) 
) {
                                $vals['commenthidden'] = '';
                        } else {
                                $comment = $revision->getComment();
                                if ( strval( $comment ) !== '' )
-                                       $vals['comment'] = $comment;
+                               {
+                                       if ( $this->fld_comment )
+                                               $vals['comment'] = $comment;
+                                       
+                                       if ( $this->fld_parsedcomment ) {
+                                               global $wgUser;
+                                               $vals['parsedcomment'] = 
$wgUser->getSkin()->formatComment( $comment, $title );
+                                       }
+                               }
                        }
                }
 
@@ -461,6 +470,7 @@
                                        'user',
                                        'size',
                                        'comment',
+                                       'parsedcomment',
                                        'content',
                                        'tags'
                                )



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to