Fix for r41837 -- apply HTML stripping to explicit alt text as well as implicit.

[lhc/web/wiklou.git] / includes / ChangesList.php

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index bad9445..41d2039 100644 (file)
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -130,7 +130,6 @@ class ChangesList {
 
                # Make date header if necessary
                $date = $wgLang->date( $rc_timestamp, true, true );
-               $s = '';
                if( $date != $this->lastdate ) {
                        if( '' != $this->lastdate ) {
                                $s .= "</ul>\n";
@@ -205,7 +204,7 @@ class ChangesList {
        }
 
        /** Insert links to user page, user talk page and eventually a blocking link */
-       protected function insertUserRelatedLinks(&$s, &$rc) {
+       public function insertUserRelatedLinks(&$s, &$rc) {
                if ( $this->isDeleted($rc,Revision::DELETED_USER) ) {
                   $s .= ' <span class="history-deleted">' . wfMsgHtml('rev-deleted-user') . '</span>';
                } else {
@@ -319,9 +318,10 @@ class OldChangesList extends ChangesList {
                # Should patrol-related stuff be shown?
                $unpatrolled = $wgUser->useRCPatrol() && $rc_patrolled == 0;
 
-               $this->insertDateHeader($s,$rc_timestamp);
+               $dateheader = ""; // $s now contains only <li>...</li>, for hooks' convenience.
+               $this->insertDateHeader($dateheader,$rc_timestamp);
 
-               $s .= '<li>';
+               $s = '';
 
                // Moved pages
                if( $rc_type == RC_MOVE || $rc_type == RC_MOVE_OVER_REDIRECT ) {
@@ -372,12 +372,14 @@ class OldChangesList extends ChangesList {
                        $s .= ' ' . wfMsg('number_of_watching_users_RCview',  $wgContLang->formatNum($rc->numberofWatchingusers));
                }
 
-               $s .= "</li>\n";
+               wfRunHooks( 'OldChangesListRecentChangesLine', array(&$this, &$s, $rc) );
+               
+               $s = "<li>$s</li>\n";
 
                wfProfileOut( $fname.'-rest' );
 
                wfProfileOut( $fname );
-               return $s;
+               return $dateheader . $s;
        }
 }