Consistent casing for addHTML()

diff --git a/includes/Article.php b/includes/Article.php
index 1884f4f..60d98cf 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -816,7 +816,7 @@ class Article {
                                $count = $pager->getNumRows();
                                if( $count > 0 ) {
                                        $pager->mLimit = 10;
-                                       $wgOut->addHtml( '<div class="mw-warning-with-logexcerpt">' );
+                                       $wgOut->addHTML( '<div class="mw-warning-with-logexcerpt">' );
                                        $wgOut->addWikiMsg( 'deleted-notice' );
                                        $wgOut->addHTML(
                                                $loglist->beginLogEventsList() .
@@ -824,7 +824,7 @@ class Article {
                                                $loglist->endLogEventsList()
                                        );
                                        if($count > 10){
-                                               $wgOut->addHtml( $wgUser->getSkin()->link(
+                                               $wgOut->addHTML( $wgUser->getSkin()->link(
                                                        SpecialPage::getTitleFor( 'Log' ),
                                                        wfMsgHtml( 'deletelog-fulllog' ),
                                                        array(),
@@ -832,7 +832,7 @@ class Article {
                                                                'type' => 'delete',
                                                                'page' => $this->mTitle->getPrefixedText() ) ) );
                                        }
-                                       $wgOut->addHtml( '</div>' );
+                                       $wgOut->addHTML( '</div>' );
                                }
                        }
                        $text = $this->getContent();
@@ -880,15 +880,15 @@ class Article {
 
                         // Pages containing custom CSS or JavaScript get special treatment
                        if( $this->mTitle->isCssOrJsPage() || $this->mTitle->isCssJsSubpage() ) {
-                               $wgOut->addHtml( wfMsgExt( 'clearyourcache', 'parse' ) );
+                               $wgOut->addHTML( wfMsgExt( 'clearyourcache', 'parse' ) );
                                // Give hooks a chance to customise the output
                                if( wfRunHooks( 'ShowRawCssJs', array( $this->mContent, $this->mTitle, $wgOut ) ) ) {
                                        // Wrap the whole lot in a <pre> and don't parse
                                        $m = array();
                                        preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
-                                       $wgOut->addHtml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
-                                       $wgOut->addHtml( htmlspecialchars( $this->mContent ) );
-                                       $wgOut->addHtml( "\n</pre>\n" );
+                                       $wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+                                       $wgOut->addHTML( htmlspecialchars( $this->mContent ) );
+                                       $wgOut->addHTML( "\n</pre>\n" );
                                }
                        } else if ( $rt = Title::newFromRedirect( $text ) ) {
                                # Don't append the subtitle if this was an old revision
@@ -2336,7 +2336,7 @@ class Article {
         * Show relevant lines from the deletion log
         */
        function showLogExtract( $out ) {
-               $out->addHtml( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
+               $out->addHTML( Xml::element( 'h2', null, LogPage::logName( 'delete' ) ) );
                LogEventsList::showLogExtract( $out, 'delete', $this->mTitle->getPrefixedText() );
        }
 
@@ -2730,7 +2730,7 @@ class Article {
                        . $wgUser->getSkin()->userToolLinks( $current->getUser(), $current->getUserText() );
                $new = $wgUser->getSkin()->userLink( $target->getUser(), $target->getUserText() )
                        . $wgUser->getSkin()->userToolLinks( $target->getUser(), $target->getUserText() );
-               $wgOut->addHtml( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
+               $wgOut->addHTML( wfMsgExt( 'rollback-success', array( 'parse', 'replaceafter' ), $old, $new ) );
                $wgOut->returnToMain( false, $this->mTitle );
 
                if( !$wgRequest->getBool( 'hidediff', false ) && !$wgUser->getBoolOption( 'norollbackdiff', false ) ) {
@@ -3290,18 +3290,18 @@ class Article {
                $wgOut->setSubtitle( wfMsg( 'infosubtitle' ) );
 
                if( !$this->mTitle->exists() ) {
-                       $wgOut->addHtml( '<div class="noarticletext">' );
+                       $wgOut->addHTML( '<div class="noarticletext">' );
                        if( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                // This doesn't quite make sense; the user is asking for
                                // information about the _page_, not the message... -- RC
-                               $wgOut->addHtml( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
+                               $wgOut->addHTML( htmlspecialchars( wfMsgWeirdKey( $this->mTitle->getText() ) ) );
                        } else {
                                $msg = $wgUser->isLoggedIn()
                                        ? 'noarticletext'
                                        : 'noarticletextanon';
-                               $wgOut->addHtml( wfMsgExt( $msg, 'parse' ) );
+                               $wgOut->addHTML( wfMsgExt( $msg, 'parse' ) );
                        }
-                       $wgOut->addHtml( '</div>' );
+                       $wgOut->addHTML( '</div>' );
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
                        $wl_clause = array(

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 69d1bc0..a974ca7 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -1598,9 +1598,9 @@ END
 
        protected function showEditTools() {
                global $wgOut;
-               $wgOut->addHtml( '<div class="mw-editTools">' );
+               $wgOut->addHTML( '<div class="mw-editTools">' );
                $wgOut->addWikiMsgArray( 'edittools', array(), array( 'content' ) );
-               $wgOut->addHtml( '</div>' );
+               $wgOut->addHTML( '</div>' );
        }
 
        function getLastDelete() {
@@ -1760,11 +1760,11 @@ END
                        $rows = $wgUser->getIntOption( 'rows' );
                        $cols = $wgUser->getIntOption( 'cols' );
                        $attribs = array( 'id' => 'wpTextbox1', 'name' => 'wpTextbox1', 'cols' => $cols, 'rows' => $rows, 'readonly' => 'readonly' );
-                       $wgOut->addHtml( '<hr />' );
+                       $wgOut->addHTML( '<hr />' );
                        $wgOut->addWikiMsg( $first ? 'blockedoriginalsource' : 'blockededitsource', $this->mTitle->getPrefixedText() );
                        # Why we don't use Xml::element here?
                        # Is it because if $source is '', it returns <textarea />?
-                       $wgOut->addHtml( Xml::openElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . Xml::closeElement( 'textarea' ) );
+                       $wgOut->addHTML( Xml::openElement( 'textarea', $attribs ) . htmlspecialchars( $source ) . Xml::closeElement( 'textarea' ) );
                }
        }
 
@@ -1782,7 +1782,7 @@ END
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
-               $wgOut->addHtml( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
+               $wgOut->addHTML( wfMsgWikiHtml( 'whitelistedittext', $loginLink ) );
                $wgOut->returnToMain( false, $wgTitle );
        }
 
@@ -1813,11 +1813,11 @@ END
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
 
-               $wgOut->addHtml( '<div id="spamprotected">' );
+               $wgOut->addHTML( '<div id="spamprotected">' );
                $wgOut->addWikiMsg( 'spamprotectiontext' );
                if ( $match )
                        $wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) );
-               $wgOut->addHtml( '</div>' );
+               $wgOut->addHTML( '</div>' );
 
                $wgOut->returnToMain( false, $wgTitle );
        }
@@ -2227,7 +2227,7 @@ END
                }
 
                global $wgOut;
-               $wgOut->addHtml( '<div id="wikiDiff">' . $difftext . '</div>' );
+               $wgOut->addHTML( '<div id="wikiDiff">' . $difftext . '</div>' );
        }
 
        /**
@@ -2364,7 +2364,7 @@ END
                $count = $pager->getNumRows();
                if ( $count > 0 ) {
                        $pager->mLimit = 10;
-                       $out->addHtml( '<div class="mw-warning-with-logexcerpt">' );
+                       $out->addHTML( '<div class="mw-warning-with-logexcerpt">' );
                        $out->addWikiMsg( 'recreate-deleted-warn' );
                        $out->addHTML(
                                $loglist->beginLogEventsList() .
@@ -2372,7 +2372,7 @@ END
                                $loglist->endLogEventsList()
                        );
                        if($count > 10){
-                               $out->addHtml( $wgUser->getSkin()->link(
+                               $out->addHTML( $wgUser->getSkin()->link(
                                        SpecialPage::getTitleFor( 'Log' ),
                                        wfMsgHtml( 'deletelog-fulllog' ),
                                        array(),
@@ -2380,7 +2380,7 @@ END
                                                'type' => 'delete',
                                                'page' => $this->mTitle->getPrefixedText() ) ) );
                        }
-                       $out->addHtml( '</div>' );
+                       $out->addHTML( '</div>' );
                        return true;
                }
                

diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 2557dc9..ebab673 100644 (file)
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -55,7 +55,7 @@ class FileDeleteForm {
                        $this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
 
                if( !self::haveDeletableFile($this->file, $this->oldfile, $this->oldimage) ) {
-                       $wgOut->addHtml( $this->prepareMessage( 'filedelete-nofile' ) );
+                       $wgOut->addHTML( $this->prepareMessage( 'filedelete-nofile' ) );
                        $wgOut->addReturnTo( $this->title );
                        return;
                }
@@ -78,7 +78,7 @@ class FileDeleteForm {
                                $wgOut->addWikiText( $status->getWikiText( 'filedeleteerror-short', 'filedeleteerror-long' ) );
                        if( $status->ok ) {
                                $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) );
-                               $wgOut->addHtml( $this->prepareMessage( 'filedelete-success' ) );
+                               $wgOut->addHTML( $this->prepareMessage( 'filedelete-success' ) );
                                // Return to the main page if we just deleted all versions of the
                                // file, otherwise go back to the description page
                                $wgOut->addReturnTo( $this->oldimage ? $this->title : Title::newMainPage() );
@@ -181,7 +181,7 @@ class FileDeleteForm {
                                $form .= '<p class="mw-filedelete-editreasons">' . $link . '</p>';
                        }
 
-               $wgOut->addHtml( $form );
+               $wgOut->addHTML( $form );
        }
 
        /**
@@ -189,7 +189,7 @@ class FileDeleteForm {
         */
        private function showLogEntries() {
                global $wgOut;
-               $wgOut->addHtml( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
+               $wgOut->addHTML( '<h2>' . htmlspecialchars( LogPage::logName( 'delete' ) ) . "</h2>\n" );
                LogEventsList::showLogExtract( $wgOut, 'delete', $this->title->getPrefixedText() );
        }
 

diff --git a/includes/FileRevertForm.php b/includes/FileRevertForm.php
index 385d83b..c7c7324 100644 (file)
--- a/includes/FileRevertForm.php
+++ b/includes/FileRevertForm.php
@@ -57,7 +57,7 @@ class FileRevertForm {
                }
 
                if( !$this->haveOldVersion() ) {
-                       $wgOut->addHtml( wfMsgExt( 'filerevert-badversion', 'parse' ) );
+                       $wgOut->addHTML( wfMsgExt( 'filerevert-badversion', 'parse' ) );
                        $wgOut->returnToMain( false, $this->title );
                        return;
                }
@@ -69,7 +69,7 @@ class FileRevertForm {
                        // TODO: Preserve file properties from database instead of reloading from file
                        $status = $this->file->upload( $source, $comment, $comment );
                        if( $status->isGood() ) {
-                               $wgOut->addHtml( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
+                               $wgOut->addHTML( wfMsgExt( 'filerevert-success', 'parse', $this->title->getText(),
                                        $wgLang->date( $this->getTimestamp(), true ),
                                        $wgLang->time( $this->getTimestamp(), true ),
                                        wfExpandUrl( $this->file->getArchiveUrl( $this->archiveName ) ) ) );
@@ -104,7 +104,7 @@ class FileRevertForm {
                $form .= '</fieldset>';
                $form .= '</form>';
 
-               $wgOut->addHtml( $form );
+               $wgOut->addHTML( $form );
        }
 
        /**

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 38f2952..f362835 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -569,23 +569,23 @@ EOT
 
                $sk = $wgUser->getSkin();
 
-               $wgOut->addHtml( '<br /><ul>' );
+               $wgOut->addHTML( '<br /><ul>' );
 
                # "Upload a new version of this file" link
                if( UploadForm::userCanReUpload($wgUser,$this->img->name) ) {
                        $ulink = $sk->makeExternalLink( $this->getUploadUrl(), wfMsg( 'uploadnewversion-linktext' ) );
-                       $wgOut->addHtml( "<li><div class='plainlinks'>{$ulink}</div></li>" );
+                       $wgOut->addHTML( "<li><div class='plainlinks'>{$ulink}</div></li>" );
                }
 
                # Link to Special:FileDuplicateSearch
                $dupeLink = $sk->makeKnownLinkObj( SpecialPage::getTitleFor( 'FileDuplicateSearch', $this->mTitle->getDBkey() ), wfMsgHtml( 'imagepage-searchdupe' ) );
-               $wgOut->addHtml( "<li>{$dupeLink}</li>" );
+               $wgOut->addHTML( "<li>{$dupeLink}</li>" );
 
                # External editing link
                $elink = $sk->makeKnownLinkObj( $this->mTitle, wfMsgHtml( 'edit-externally' ), 'action=edit&externaledit=true&mode=file' );
-               $wgOut->addHtml( '<li>' . $elink . '<div>' . wfMsgWikiHtml( 'edit-externally-help' ) . '</div></li>' );
+               $wgOut->addHTML( '<li>' . $elink . '<div>' . wfMsgWikiHtml( 'edit-externally-help' ) . '</div></li>' );
 
-               $wgOut->addHtml( '</ul>' );
+               $wgOut->addHTML( '</ul>' );
        }
 
        function closeShowImage()

diff --git a/includes/ImageQueryPage.php b/includes/ImageQueryPage.php
index da9b6fd..f4c8b2a 100644 (file)
--- a/includes/ImageQueryPage.php
+++ b/includes/ImageQueryPage.php
@@ -34,7 +34,7 @@ class ImageQueryPage extends QueryPage {
                                }
                        }
 
-                       $out->addHtml( $gallery->toHtml() );
+                       $out->addHTML( $gallery->toHtml() );
                }
        }
 

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 264096a..7083c43 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -52,7 +52,7 @@ class LogEventsList {
        public function showHeader( $type ) {
                if( LogPage::isLogType( $type ) ) {
                        $this->out->setPageTitle( LogPage::logName( $type ) );
-                       $this->out->addHtml( LogPage::logHeader( $type ) );
+                       $this->out->addHTML( LogPage::logHeader( $type ) );
                }
        }
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 99b7aaf..981257d 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1075,7 +1075,7 @@ class OutputPage {
 
                array_unshift( $params, 'parse' );
                array_unshift( $params, $msg );
-               $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) );
+               $this->addHTML( call_user_func_array( 'wfMsgExt', $params ) );
 
                $this->returnToMain();
        }
@@ -1186,8 +1186,8 @@ class OutputPage {
 
                $loginTitle = SpecialPage::getTitleFor( 'Userlogin' );
                $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() );
-               $this->addHtml( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
-               $this->addHtml( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
+               $this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
+               $this->addHTML( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
 
                # Don't return to the main page if the user can't read it
                # otherwise we'll end up in a pointless loop
@@ -1382,7 +1382,7 @@ class OutputPage {
        public function addReturnTo( $title ) {
                global $wgUser;
                $link = wfMsg( 'returnto', $wgUser->getSkin()->makeLinkObj( $title ) );
-               $this->addHtml( "<p>{$link}</p>\n" );
+               $this->addHTML( "<p>{$link}</p>\n" );
        }
 
        /**
@@ -1770,7 +1770,7 @@ class OutputPage {
                                ? 'lag-warn-normal'
                                : 'lag-warn-high';
                        $warning = wfMsgExt( $message, 'parse', $lag );
-                       $this->addHtml( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
+                       $this->addHTML( "<div class=\"mw-{$message}\">\n{$warning}\n</div>\n" );
                }
        }
 

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 8ebd563..5f1acdb 100644 (file)
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -337,22 +337,22 @@ class QueryPage {
 
                $this->preprocessResults( $dbr, $res );
 
-               $wgOut->addHtml( XML::openElement( 'div', array('class' => 'mw-spcontent') ) );
+               $wgOut->addHTML( XML::openElement( 'div', array('class' => 'mw-spcontent') ) );
 
                # Top header and navigation
                if( $shownavigation ) {
-                       $wgOut->addHtml( $this->getPageHeader() );
+                       $wgOut->addHTML( $this->getPageHeader() );
                        if( $num > 0 ) {
-                               $wgOut->addHtml( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );
+                               $wgOut->addHTML( '<p>' . wfShowingResults( $offset, $num ) . '</p>' );
                                # Disable the "next" link when we reach the end
                                $paging = wfViewPrevNext( $offset, $limit, $wgContLang->specialPage( $sname ),
                                        wfArrayToCGI( $this->linkParameters() ), ( $num < $limit ) );
-                               $wgOut->addHtml( '<p>' . $paging . '</p>' );
+                               $wgOut->addHTML( '<p>' . $paging . '</p>' );
                        } else {
                                # No results to show, so don't bother with "showing X of Y" etc.
                                # -- just let the user know and give up now
-                               $wgOut->addHtml( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
-                               $wgOut->addHtml( XML::closeElement( 'div' ) );
+                               $wgOut->addHTML( '<p>' . wfMsgHtml( 'specialpage-empty' ) . '</p>' );
+                               $wgOut->addHTML( XML::closeElement( 'div' ) );
                                return;
                        }
                }
@@ -369,10 +369,10 @@ class QueryPage {
 
                # Repeat the paging links at the bottom
                if( $shownavigation ) {
-                       $wgOut->addHtml( '<p>' . $paging . '</p>' );
+                       $wgOut->addHTML( '<p>' . $paging . '</p>' );
                }
 
-               $wgOut->addHtml( XML::closeElement( 'div' ) );
+               $wgOut->addHTML( XML::closeElement( 'div' ) );
 
                return $num;
        }
@@ -431,7 +431,7 @@ class QueryPage {
                                ? $wgContLang->listToText( $html )
                                : implode( '', $html );
 
-                       $out->addHtml( $html );
+                       $out->addHTML( $html );
                }
        }
 

diff --git a/includes/WatchlistEditor.php b/includes/WatchlistEditor.php
index 9877844..82c524c 100644 (file)
--- a/includes/WatchlistEditor.php
+++ b/includes/WatchlistEditor.php
@@ -46,19 +46,19 @@ class WatchlistEditor {
                                                $this->unwatchTitles( $toUnwatch, $user );
                                                $user->invalidateCache();
                                                if( count( $toWatch ) > 0 || count( $toUnwatch ) > 0 )
-                                                       $output->addHtml( wfMsgExt( 'watchlistedit-raw-done', 'parse' ) );
+                                                       $output->addHTML( wfMsgExt( 'watchlistedit-raw-done', 'parse' ) );
                                                if( ( $count = count( $toWatch ) ) > 0 ) {
-                                                       $output->addHtml( wfMsgExt( 'watchlistedit-raw-added', 'parse', $count ) );
+                                                       $output->addHTML( wfMsgExt( 'watchlistedit-raw-added', 'parse', $count ) );
                                                        $this->showTitles( $toWatch, $output, $wgUser->getSkin() );
                                                }
                                                if( ( $count = count( $toUnwatch ) ) > 0 ) {
-                                                       $output->addHtml( wfMsgExt( 'watchlistedit-raw-removed', 'parse', $count ) );
+                                                       $output->addHTML( wfMsgExt( 'watchlistedit-raw-removed', 'parse', $count ) );
                                                        $this->showTitles( $toUnwatch, $output, $wgUser->getSkin() );
                                                }
                                        } else {
                                                $this->clearWatchlist( $user );
                                                $user->invalidateCache();
-                                               $output->addHtml( wfMsgExt( 'watchlistedit-raw-removed', 'parse', count( $current ) ) );
+                                               $output->addHTML( wfMsgExt( 'watchlistedit-raw-removed', 'parse', count( $current ) ) );
                                                $this->showTitles( $current, $output, $wgUser->getSkin() );
                                        }
                                }
@@ -70,7 +70,7 @@ class WatchlistEditor {
                                        $titles = $this->extractTitles( $request->getArray( 'titles' ) );
                                        $this->unwatchTitles( $titles, $user );
                                        $user->invalidateCache();
-                                       $output->addHtml( wfMsgExt( 'watchlistedit-normal-done', 'parse',
+                                       $output->addHTML( wfMsgExt( 'watchlistedit-normal-done', 'parse',
                                                $GLOBALS['wgLang']->formatNum( count( $titles ) ) ) );
                                        $this->showTitles( $titles, $output, $wgUser->getSkin() );
                                }
@@ -138,16 +138,16 @@ class WatchlistEditor {
                }
                $batch->execute();
                // Print out the list
-               $output->addHtml( "<ul>\n" );
+               $output->addHTML( "<ul>\n" );
                foreach( $titles as $title ) {
                        if( !$title instanceof Title )
                                $title = Title::newFromText( $title );
                        if( $title instanceof Title ) {
-                               $output->addHtml( "<li>" . $skin->makeLinkObj( $title )
+                               $output->addHTML( "<li>" . $skin->makeLinkObj( $title )
                                . ' (' . $skin->makeLinkObj( $title->getTalkPage(), $talk ) . ")</li>\n" );
                        }
                }
-               $output->addHtml( "</ul>\n" );
+               $output->addHTML( "</ul>\n" );
        }
 
        /**
@@ -239,10 +239,10 @@ class WatchlistEditor {
         */
        private function showItemCount( $output, $user ) {
                if( ( $count = $this->countWatchlist( $user ) ) > 0 ) {
-                       $output->addHtml( wfMsgExt( 'watchlistedit-numitems', 'parse',
+                       $output->addHTML( wfMsgExt( 'watchlistedit-numitems', 'parse',
                                $GLOBALS['wgLang']->formatNum( $count ) ) );
                } else {
-                       $output->addHtml( wfMsgExt( 'watchlistedit-noitems', 'parse' ) );
+                       $output->addHTML( wfMsgExt( 'watchlistedit-noitems', 'parse' ) );
                }
                return $count;
        }
@@ -355,7 +355,7 @@ class WatchlistEditor {
                        }
                        $form .= '<p>' . Xml::submitButton( wfMsg( 'watchlistedit-normal-submit' ) ) . '</p>';
                        $form .= '</fieldset></form>';
-                       $output->addHtml( $form );
+                       $output->addHTML( $form );
                }
        }
 
@@ -421,7 +421,7 @@ class WatchlistEditor {
                $form .= '</textarea>';
                $form .= '<p>' . Xml::submitButton( wfMsg( 'watchlistedit-raw-submit' ) ) . '</p>';
                $form .= '</fieldset></form>';
-               $output->addHtml( $form );
+               $output->addHTML( $form );
        }
 
        /**

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index 393cdd1..032bfdf 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -321,9 +321,9 @@ CONTROL;
                                // Wrap the whole lot in a <pre> and don't parse
                                $m = array();
                                preg_match( '!\.(css|js)$!u', $this->mTitle->getText(), $m );
-                               $wgOut->addHtml( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
-                               $wgOut->addHtml( htmlspecialchars( $this->mNewtext ) );
-                               $wgOut->addHtml( "\n</pre>\n" );
+                               $wgOut->addHTML( "<pre class=\"mw-code mw-{$m[1]}\" dir=\"ltr\">\n" );
+                               $wgOut->addHTML( htmlspecialchars( $this->mNewtext ) );
+                               $wgOut->addHTML( "\n</pre>\n" );
                        }
                } else
                $wgOut->addWikiTextTidy( $this->mNewtext );
@@ -393,7 +393,7 @@ CONTROL;
                $differ = new HTMLDiffer(new DelegatingContentHandler($wgOut));
                $differ->htmlDiff($oldHtml, $newHtml);
                if ( $wgDebugComments ) {
-                       $wgOut->addHtml( "\n<!-- HtmlDiff Debug Output:\n" . HTMLDiffer::getDebugOutput() . " End Debug -->" );
+                       $wgOut->addHTML( "\n<!-- HtmlDiff Debug Output:\n" . HTMLDiffer::getDebugOutput() . " End Debug -->" );
                }
 
                wfProfileOut( __METHOD__ );

diff --git a/includes/diff/HTMLDiff.php b/includes/diff/HTMLDiff.php
index 0698059..eec09ca 100644 (file)
--- a/includes/diff/HTMLDiff.php
+++ b/includes/diff/HTMLDiff.php
@@ -634,7 +634,7 @@ class ChangeTextGenerator {
                $txt = new ChangeText;
                $rootlistopened = false;
                if (count($differences) > 1) {
-                       $txt->addHtml('<ul class="changelist">');
+                       $txt->addHTML('<ul class="changelist">');
                        $rootlistopened = true;
                }
                $nbDifferences = count($differences);
@@ -642,44 +642,44 @@ class ChangeTextGenerator {
                        $d = $differences[$j];
                        $lvl1listopened = false;
                        if ($rootlistopened) {
-                               $txt->addHtml('<li>');
+                               $txt->addHTML('<li>');
                        }
                        if ($d->leftlength + $d->rightlength > 1) {
-                               $txt->addHtml('<ul class="changelist">');
+                               $txt->addHTML('<ul class="changelist">');
                                $lvl1listopened = true;
                        }
                        // left are the old ones
                        for ($i = $d->leftstart; $i < $d->leftend; ++$i) {
                                if ($lvl1listopened){
-                                       $txt->addHtml('<li>');
+                                       $txt->addHTML('<li>');
                                }
                                // add a bullet for a old tag
                                $this->addTagOld($txt, $this->other->ancestors[$i]);
                                if ($lvl1listopened){
-                                       $txt->addHtml('</li>');
+                                       $txt->addHTML('</li>');
                                }
                        }
                        // right are the new ones
                        for ($i = $d->rightstart; $i < $d->rightend; ++$i) {
                                if ($lvl1listopened){
-                                       $txt->addHtml('<li>');
+                                       $txt->addHTML('<li>');
                                }
                                // add a bullet for a new tag
                                $this->addTagNew($txt, $this->ancestorComparator->ancestors[$i]);
 
                                if ($lvl1listopened){
-                                       $txt->addHtml('</li>');
+                                       $txt->addHTML('</li>');
                                }
                        }
                        if ($lvl1listopened) {
-                               $txt->addHtml('</ul>');
+                               $txt->addHTML('</ul>');
                        }
                        if ($rootlistopened) {
-                               $txt->addHtml('</li>');
+                               $txt->addHTML('</li>');
                        }
                }
                if ($rootlistopened) {
-                       $txt->addHtml('</ul>');
+                       $txt->addHTML('</ul>');
                }
                return $txt;
        }
@@ -697,7 +697,7 @@ class ChangeText {
 
        private $txt = "";
 
-       public function addHtml($s) {
+       public function addHTML($s) {
                $this->txt .= $s;
        }
 
@@ -759,14 +759,14 @@ class TagToString {
                        $tagDescription = "&lt;" . $this->node->qName . "&gt;";
                }
                if ($this->sem == TagToStringFactory::MOVED) {
-                       $txt->addHtml( wfMsgExt( 'diff-movedoutof', 'parseinline', $tagDescription ) );
+                       $txt->addHTML( wfMsgExt( 'diff-movedoutof', 'parseinline', $tagDescription ) );
                } else if ($this->sem == TagToStringFactory::STYLE) {
-                       $txt->addHtml( wfMsgExt( 'diff-styleremoved' , 'parseinline', $tagDescription ) );
+                       $txt->addHTML( wfMsgExt( 'diff-styleremoved' , 'parseinline', $tagDescription ) );
                } else {
-                       $txt->addHtml( wfMsgExt( 'diff-removed' , 'parseinline', $tagDescription ) );
+                       $txt->addHTML( wfMsgExt( 'diff-removed' , 'parseinline', $tagDescription ) );
                }
                $this->addAttributes($txt, $this->node->attributes);
-               $txt->addHtml('.');
+               $txt->addHTML('.');
        }
 
        public function getAddedDescription(ChangeText $txt) {
@@ -775,14 +775,14 @@ class TagToString {
                        $tagDescription = "&lt;" . $this->node->qName . "&gt;";
                }
                if ($this->sem == TagToStringFactory::MOVED) {
-                       $txt->addHtml( wfMsgExt( 'diff-movedto' , 'parseinline', $tagDescription) );
+                       $txt->addHTML( wfMsgExt( 'diff-movedto' , 'parseinline', $tagDescription) );
                } else if ($this->sem == TagToStringFactory::STYLE) {
-                       $txt->addHtml( wfMsgExt( 'diff-styleadded', 'parseinline', $tagDescription ) );
+                       $txt->addHTML( wfMsgExt( 'diff-styleadded', 'parseinline', $tagDescription ) );
                } else {
-                       $txt->addHtml( wfMsgExt( 'diff-added', 'parseinline', $tagDescription ) );
+                       $txt->addHTML( wfMsgExt( 'diff-added', 'parseinline', $tagDescription ) );
                }
                $this->addAttributes($txt, $this->node->attributes);
-               $txt->addHtml('.');
+               $txt->addHTML('.');
        }
 
        protected function addAttributes(ChangeText $txt, array $attributes) {
@@ -797,17 +797,17 @@ class TagToString {
                        $attr = $attributes[$key];
                        if($firstOne) {
                                $firstOne = false;
-                               $txt->addHtml( wfMsgExt('diff-with', 'escapenoentities', $this->translateArgument($key), htmlspecialchars($attr) ) );
+                               $txt->addHTML( wfMsgExt('diff-with', 'escapenoentities', $this->translateArgument($key), htmlspecialchars($attr) ) );
                                continue;
                        }
-                       $txt->addHtml( wfMsgExt( 'comma-separator', 'escapenoentities' ) .
+                       $txt->addHTML( wfMsgExt( 'comma-separator', 'escapenoentities' ) .
                                wfMsgExt( 'diff-with-additional', 'escapenoentities',
                                $this->translateArgument( $key ), htmlspecialchars( $attr ) )
                        );
                }
 
                if ($nbAttributes_min_1 > 0) {
-                       $txt->addHtml( wfMsgExt( 'diff-with-final', 'escapenoentities',
+                       $txt->addHTML( wfMsgExt( 'diff-with-final', 'escapenoentities',
                        $this->translateArgument($keys[$nbAttributes_min_1]),
                        htmlspecialchars($attributes[$keys[$nbAttributes_min_1]]) ) );
                }
@@ -833,15 +833,15 @@ class NoContentTagToString extends TagToString {
                if( wfEmptyMsg( 'diff-' . $this->node->qName, $tagDescription ) ){
                        $tagDescription = "&lt;" . $this->node->qName . "&gt;";
                }
-               $txt->addHtml( wfMsgExt('diff-changedto', 'parseinline', $tagDescription ) );
+               $txt->addHTML( wfMsgExt('diff-changedto', 'parseinline', $tagDescription ) );
                $this->addAttributes($txt, $this->node->attributes);
-               $txt->addHtml('.');
+               $txt->addHTML('.');
        }
 
        public function getRemovedDescription(ChangeText $txt) {
-               $txt->addHtml( wfMsgExt('diff-changedfrom', 'parseinline', $tagDescription ) );
+               $txt->addHTML( wfMsgExt('diff-changedfrom', 'parseinline', $tagDescription ) );
                $this->addAttributes($txt, $this->node->attributes);
-               $txt->addHtml('.');
+               $txt->addHTML('.');
        }
 }
 
@@ -853,7 +853,7 @@ class AnchorToString extends TagToString {
 
        protected function addAttributes(ChangeText $txt, array $attributes) {
                if (array_key_exists('href', $attributes)) {
-                       $txt->addHtml(' ' . wfMsgExt( 'diff-withdestination', 'parseinline', htmlspecialchars($attributes['href']) ) );
+                       $txt->addHTML(' ' . wfMsgExt( 'diff-withdestination', 'parseinline', htmlspecialchars($attributes['href']) ) );
                        unset($attributes['href']);
                }
                parent::addAttributes($txt, $attributes);
@@ -988,18 +988,18 @@ class DelegatingContentHandler {
        }
 
        function startElement($qname, /*array*/ $arguments) {
-               $this->delegate->addHtml(Xml::openElement($qname, $arguments));
+               $this->delegate->addHTML(Xml::openElement($qname, $arguments));
        }
 
        function endElement($qname){
-               $this->delegate->addHtml(Xml::closeElement($qname));
+               $this->delegate->addHTML(Xml::closeElement($qname));
        }
 
        function characters($chars){
-               $this->delegate->addHtml(htmlspecialchars($chars));
+               $this->delegate->addHTML(htmlspecialchars($chars));
        }
 
        function html($html){
-               $this->delegate->addHtml($html);
+               $this->delegate->addHTML($html);
        }
 }

diff --git a/includes/specials/SpecialAllpages.php b/includes/specials/SpecialAllpages.php
index 1dc9be1..c6c1002 100644 (file)
--- a/includes/specials/SpecialAllpages.php
+++ b/includes/specials/SpecialAllpages.php
@@ -192,7 +192,7 @@ class SpecialAllpages extends IncludableSpecialPage {
                        if( !empty($lines) ) {
                                $this->showChunk( $namespace, $lines[0], $lines[count($lines)-1] );
                        } else {
-                               $wgOut->addHtml( $this->namespaceForm( $namespace, $from, $to ) );
+                               $wgOut->addHTML( $this->namespaceForm( $namespace, $from, $to ) );
                        }
                        return;
                }
@@ -222,7 +222,7 @@ class SpecialAllpages extends IncludableSpecialPage {
                                $out2 = $nsForm . '<hr />';
                        }
                }
-               $wgOut->addHtml( $out2 . $out );
+               $wgOut->addHTML( $out2 . $out );
        }
 
        /**
@@ -397,9 +397,9 @@ class SpecialAllpages extends IncludableSpecialPage {
                        $out2 .= "</td></tr></table><hr />";
                }
 
-               $wgOut->addHtml( $out2 . $out );
+               $wgOut->addHTML( $out2 . $out );
                if( isset($prevLink) or isset($nextLink) ) {
-                       $wgOut->addHtml( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
+                       $wgOut->addHTML( '<hr /><p style="font-size: smaller; float: ' . $align . '">' );
                        if( isset( $prevLink ) ) {
                                $wgOut->addHTML( $prevLink );
                        }

diff --git a/includes/specials/SpecialBlockip.php b/includes/specials/SpecialBlockip.php
index 15edf74..f9019a7 100644 (file)
--- a/includes/specials/SpecialBlockip.php
+++ b/includes/specials/SpecialBlockip.php
@@ -298,7 +298,7 @@ class IPBlockForm {
                        Xml::tags( 'script', array( 'type' => 'text/javascript' ), 'updateBlockOptions()' ) . "\n"
                );
 
-               $wgOut->addHtml( $this->getConvenienceLinks() );
+               $wgOut->addHTML( $this->getConvenienceLinks() );
 
                if( is_object( $user ) ) {
                        $this->showLogFragment( $wgOut, $user->getUserPage() );
@@ -466,15 +466,15 @@ class IPBlockForm {
                $wgOut->setPagetitle( wfMsg( 'blockip' ) );
                $wgOut->setSubtitle( wfMsg( 'blockipsuccesssub' ) );
                $text = wfMsgExt( 'blockipsuccesstext', array( 'parse' ), $this->BlockAddress );
-               $wgOut->addHtml( $text );
+               $wgOut->addHTML( $text );
        }
 
        function showLogFragment( $out, $title ) {
                global $wgUser;
-               $out->addHtml( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
+               $out->addHTML( Xml::element( 'h2', NULL, LogPage::logName( 'block' ) ) );
                $count = LogEventsList::showLogExtract( $out, 'block', $title->getPrefixedText(), '', 10 );
                if($count > 10){
-                       $out->addHtml( $wgUser->getSkin()->link(
+                       $out->addHTML( $wgUser->getSkin()->link(
                                SpecialPage::getTitleFor( 'Log' ),
                                wfMsgHtml( 'blocklog-fulllog' ),
                                array(),

diff --git a/includes/specials/SpecialBooksources.php b/includes/specials/SpecialBooksources.php
index 0690c5c..ba91289 100644 (file)
--- a/includes/specials/SpecialBooksources.php
+++ b/includes/specials/SpecialBooksources.php
@@ -32,7 +32,7 @@ class SpecialBookSources extends SpecialPage {
                $this->setHeaders();
                $this->isbn = $this->cleanIsbn( $isbn ? $isbn : $wgRequest->getText( 'isbn' ) );
                $wgOut->addWikiMsg( 'booksources-summary' );
-               $wgOut->addHtml( $this->makeForm() );
+               $wgOut->addHTML( $this->makeForm() );
                if( strlen( $this->isbn ) > 0 )
                        $this->showList();
        }
@@ -88,11 +88,11 @@ class SpecialBookSources extends SpecialPage {
 
                # Fall back to the defaults given in the language file
                $wgOut->addWikiMsg( 'booksources-text' );
-               $wgOut->addHtml( '<ul>' );
+               $wgOut->addHTML( '<ul>' );
                $items = $wgContLang->getBookstoreList();
                foreach( $items as $label => $url )
-                       $wgOut->addHtml( $this->makeListItem( $label, $url ) );
-               $wgOut->addHtml( '</ul>' );
+                       $wgOut->addHTML( $this->makeListItem( $label, $url ) );
+               $wgOut->addHTML( '</ul>' );
                return true;
        }
 

diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index 7366bcc..eaea152 100644 (file)
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -37,7 +37,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
                                $self = SpecialPage::getTitleFor( 'Confirmemail' );
                                $skin = $wgUser->getSkin();
                                $llink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $self->getPrefixedUrl() );
-                               $wgOut->addHtml( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
+                               $wgOut->addHTML( wfMsgWikiHtml( 'confirmemail_needlogin', $llink ) );
                        }
                } else {
                        $this->attemptConfirm( $code );
@@ -75,7 +75,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
                        $form .= wfHidden( 'token', $wgUser->editToken() );
                        $form .= wfSubmitButton( wfMsgHtml( 'confirmemail_send' ) );
                        $form .= wfCloseElement( 'form' );
-                       $wgOut->addHtml( $form );
+                       $wgOut->addHTML( $form );
                }
        }
 

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 575210b..4755e33 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -130,9 +130,9 @@ class SpecialContributions extends SpecialPage {
 
                        $text = wfMsgNoTrans( $message, $target );
                        if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
-                               $wgOut->addHtml( '<div class="mw-contributions-footer">' );
+                               $wgOut->addHTML( '<div class="mw-contributions-footer">' );
                                $wgOut->addWikiText( $text );
-                               $wgOut->addHtml( '</div>' );
+                               $wgOut->addHTML( '</div>' );
                        }
                }
        }

diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 9779987..513d25e 100644 (file)
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -263,9 +263,9 @@ class DeletedContributionsPage extends SpecialPage {
 
                        $text = wfMsgNoTrans( $message, $target );
                        if( !wfEmptyMsg( $message, $text ) && $text != '-' ) {
-                               $wgOut->addHtml( '<div class="mw-contributions-footer">' );
+                               $wgOut->addHTML( '<div class="mw-contributions-footer">' );
                                $wgOut->addWikiText( $text );
-                               $wgOut->addHtml( '</div>' );
+                               $wgOut->addHTML( '</div>' );
                        }
                }
        }

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 32a43ec..18c657f 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -273,7 +273,7 @@ function wfSpecialExport( $page = '' ) {
        }
 
        $self = SpecialPage::getTitleFor( 'Export' );
-       $wgOut->addHtml( wfMsgExt( 'exporttext', 'parse' ) );
+       $wgOut->addHTML( wfMsgExt( 'exporttext', 'parse' ) );
 
        $form = Xml::openElement( 'form', array( 'method' => 'post',
                'action' => $self->getLocalUrl( 'action=submit' ) ) );
@@ -289,7 +289,7 @@ function wfSpecialExport( $page = '' ) {
        if( $wgExportAllowHistory ) {
                $form .= Xml::checkLabel( wfMsg( 'exportcuronly' ), 'curonly', 'curonly', true ) . '<br />';
        } else {
-               $wgOut->addHtml( wfMsgExt( 'exportnohistory', 'parse' ) );
+               $wgOut->addHTML( wfMsgExt( 'exportnohistory', 'parse' ) );
        }
        $form .= Xml::checkLabel( wfMsg( 'export-templates' ), 'templates', 'wpExportTemplates', false ) . '<br />';
        // Enable this when we can do something useful exporting/importing image information. :)
@@ -298,5 +298,5 @@ function wfSpecialExport( $page = '' ) {
 
        $form .= Xml::submitButton( wfMsg( 'export-submit' ), array( 'accesskey' => 's' ) );
        $form .= Xml::closeElement( 'form' );
-       $wgOut->addHtml( $form );
+       $wgOut->addHTML( $form );
 }

diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 71ce60f..833d6a8 100644 (file)
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -183,7 +183,7 @@ class ImportReporter {
 
        function open() {
                global $wgOut;
-               $wgOut->addHtml( "<ul>\n" );
+               $wgOut->addHTML( "<ul>\n" );
        }
 
        function reportPage( $title, $origTitle, $revisionCount, $successCount ) {
@@ -197,7 +197,7 @@ class ImportReporter {
                $contentCount = $wgContLang->formatNum( $successCount );
 
                if( $successCount > 0 ) {
-                       $wgOut->addHtml( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
+                       $wgOut->addHTML( "<li>" . $skin->makeKnownLinkObj( $title ) . " " .
                                wfMsgExt( 'import-revision-count', array( 'parsemag', 'escape' ), $localCount ) .
                                "</li>\n"
                        );
@@ -225,17 +225,17 @@ class ImportReporter {
                        $article->updateRevisionOn( $dbw, $nullRevision );
                        wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest) );
                } else {
-                       $wgOut->addHtml( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
+                       $wgOut->addHTML( '<li>' . wfMsgHtml( 'import-nonewrevisions' ) . '</li>' );
                }
        }
 
        function close() {
                global $wgOut;
                if( $this->mPageCount == 0 ) {
-                       $wgOut->addHtml( "</ul>\n" );
+                       $wgOut->addHTML( "</ul>\n" );
                        return new WikiErrorMsg( "importnopages" );
                }
-               $wgOut->addHtml( "</ul>\n" );
+               $wgOut->addHTML( "</ul>\n" );
 
                return $this->mPageCount;
        }

diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index 6cce00a..6b9df58 100644 (file)
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -61,7 +61,7 @@ function wfSpecialLinkSearch( $par ) {
        $s .=   Xml::submitButton( wfMsg( 'linksearch-ok' ) ) .
                '</fieldset>' .
                Xml::closeElement( 'form' );
-       $wgOut->addHtml( $s );
+       $wgOut->addHTML( $s );
 
        if( $target != '' ) {
                $searcher = new LinkSearchPage;
@@ -168,7 +168,7 @@ class LinkSearchPage extends QueryPage {
                } else {
                        // For debugging
                        // Generates invalid xhtml with patterns that contain --
-                       //$wgOut->addHtml( "\n<!-- " . htmlspecialchars( $this->mMungedQuery ) . " -->\n" );
+                       //$wgOut->addHTML( "\n<!-- " . htmlspecialchars( $this->mMungedQuery ) . " -->\n" );
                        parent::doQuery( $offset, $limit, $shownavigation );
                }
        }

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index d16f308..683b236 100644 (file)
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -115,7 +115,7 @@ class MergehistoryForm {
 
                $wgOut->addWikiMsg( 'mergehistory-header' );
 
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::openElement( 'form', array(
                                'method' => 'get',
                                'action' => $wgScript ) ) .
@@ -158,7 +158,7 @@ class MergehistoryForm {
                $action = $titleObj->getLocalURL( "action=submit" );
                # Start the form here
                $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'merge' ) );
-               $wgOut->addHtml( $top );
+               $wgOut->addHTML( $top );
 
                if( $haveRevisions ) {
                        # Format the user-visible controls (comment field, submission button)
@@ -190,7 +190,7 @@ class MergehistoryForm {
                                Xml::closeElement( 'table' ) .
                                Xml::closeElement( 'fieldset' );
 
-                       $wgOut->addHtml( $table );
+                       $wgOut->addHTML( $table );
                }
 
                $wgOut->addHTML( "<h2 id=\"mw-mergehistory\">" . wfMsgHtml( "mergehistory-list" ) . "</h2>\n" );
@@ -217,7 +217,7 @@ class MergehistoryForm {
                $misc .= Xml::hidden( 'dest', $this->mDest );
                $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
                $misc .= Xml::closeElement( 'form' );
-               $wgOut->addHtml( $misc );
+               $wgOut->addHTML( $misc );
 
                return true;
        }
@@ -372,7 +372,7 @@ class MergehistoryForm {
                $log->addEntry( 'merge', $targetTitle, $this->mComment,
                        array($destTitle->getPrefixedText(),$TimestampLimit) );
 
-               $wgOut->addHtml( wfMsgExt( 'mergehistory-success', array('parseinline'),
+               $wgOut->addHTML( wfMsgExt( 'mergehistory-success', array('parseinline'),
                        $targetTitle->getPrefixedText(), $destTitle->getPrefixedText(), $count ) );
 
                wfRunHooks( 'ArticleMergeComplete', array( $targetTitle, $destTitle ) );

diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index bec21cd..9f5329f 100644 (file)
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -646,7 +646,7 @@ class PreferencesForm {
                        );
 
                if( wfRunHooks( 'PreferencesUserInformationPanel', array( $this, &$userInformationHtml ) ) ) {
-                       $wgOut->addHtml( $userInformationHtml );
+                       $wgOut->addHTML( $userInformationHtml );
                }
 
                if ( $wgAllowRealName ) {
@@ -731,7 +731,7 @@ class PreferencesForm {
                        }
 
                        if(count($variantArray) > 1) {
-                               $wgOut->addHtml(
+                               $wgOut->addHTML(
                                        $this->tableRow(
                                                Xml::label( wfMsg( 'yourvariant' ), 'wpUserVariant' ),
                                                Xml::tags( 'select',
@@ -743,7 +743,7 @@ class PreferencesForm {
                        }
 
                        if(count($variantArray) > 1 && !$wgDisableLangConversion && !$wgDisableTitleConversion) {
-                               $wgOut->addHtml(
+                               $wgOut->addHTML(
                                        Xml::tags( 'tr', null,
                                                Xml::tags( 'td', array( 'colspan' => '2' ),
                                                        $this->getToggle( "noconvertlink" )
@@ -822,17 +822,17 @@ class PreferencesForm {
                # Quickbar
                #
                if ($this->mSkin == 'cologneblue' || $this->mSkin == 'standard') {
-                       $wgOut->addHtml( "<fieldset>\n<legend>" . wfMsg( 'qbsettings' ) . "</legend>\n" );
+                       $wgOut->addHTML( "<fieldset>\n<legend>" . wfMsg( 'qbsettings' ) . "</legend>\n" );
                        for ( $i = 0; $i < count( $qbs ); ++$i ) {
                                if ( $i == $this->mQuickbar ) { $checked = ' checked="checked"'; }
                                else { $checked = ""; }
                                $wgOut->addHTML( "<div><label><input type='radio' name='wpQuickbar' value=\"$i\"$checked />{$qbs[$i]}</label></div>\n" );
                        }
-                       $wgOut->addHtml( "</fieldset>\n\n" );
+                       $wgOut->addHTML( "</fieldset>\n\n" );
                } else {
                        # Need to output a hidden option even if the relevant skin is not in use,
                        # otherwise the preference will get reset to 0 on submit
-                       $wgOut->addHtml( wfHidden( 'wpQuickbar', $this->mQuickbar ) );
+                       $wgOut->addHTML( wfHidden( 'wpQuickbar', $this->mQuickbar ) );
                }
 
                # Skin
@@ -1004,10 +1004,10 @@ class PreferencesForm {
                                'forceeditsummary',
                        ) ) );
                
-               $wgOut->addHtml( '</fieldset>' );
+               $wgOut->addHTML( '</fieldset>' );
 
                # Recent changes
-               $wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' );
+               $wgOut->addHTML( '<fieldset><legend>' . wfMsgHtml( 'prefs-rc' ) . '</legend>' );
 
                $rc  = '<table><tr>';
                $rc .= '<td>' . Xml::label( wfMsg( 'recentchangesdays' ), 'wpRecentDays' ) . '</td>';
@@ -1016,42 +1016,42 @@ class PreferencesForm {
                $rc .= '<td>' . Xml::label( wfMsg( 'recentchangescount' ), 'wpRecent' ) . '</td>';
                $rc .= '<td>' . Xml::input( 'wpRecent', 3, $this->mRecent, array( 'id' => 'wpRecent' ) ) . '</td>';
                $rc .= '</tr></table>';
-               $wgOut->addHtml( $rc );
+               $wgOut->addHTML( $rc );
 
-               $wgOut->addHtml( '<br />' );
+               $wgOut->addHTML( '<br />' );
 
                $toggles[] = 'hideminor';
                if( $wgRCShowWatchingUsers )
                        $toggles[] = 'shownumberswatching';
                $toggles[] = 'usenewrc';
-               $wgOut->addHtml( $this->getToggles( $toggles ) );
+               $wgOut->addHTML( $this->getToggles( $toggles ) );
 
-               $wgOut->addHtml( '</fieldset>' );
+               $wgOut->addHTML( '</fieldset>' );
 
                # Watchlist
-               $wgOut->addHtml( '<fieldset><legend>' . wfMsgHtml( 'prefs-watchlist' ) . '</legend>' );
+               $wgOut->addHTML( '<fieldset><legend>' . wfMsgHtml( 'prefs-watchlist' ) . '</legend>' );
 
-               $wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-days' ), 'wpWatchlistDays', 'wpWatchlistDays', 3, $this->mWatchlistDays ) );
-               $wgOut->addHtml( '<br /><br />' );
+               $wgOut->addHTML( wfInputLabel( wfMsg( 'prefs-watchlist-days' ), 'wpWatchlistDays', 'wpWatchlistDays', 3, $this->mWatchlistDays ) );
+               $wgOut->addHTML( '<br /><br />' );
 
-               $wgOut->addHtml( $this->getToggle( 'extendwatchlist' ) );
-               $wgOut->addHtml( wfInputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) );
-               $wgOut->addHtml( '<br /><br />' );
+               $wgOut->addHTML( $this->getToggle( 'extendwatchlist' ) );
+               $wgOut->addHTML( wfInputLabel( wfMsg( 'prefs-watchlist-edits' ), 'wpWatchlistEdits', 'wpWatchlistEdits', 3, $this->mWatchlistEdits ) );
+               $wgOut->addHTML( '<br /><br />' );
 
-               $wgOut->addHtml( $this->getToggles( array( 'watchlisthideminor', 'watchlisthidebots', 'watchlisthideown', 'watchlisthideanons', 'watchlisthideliu' ) ) );
+               $wgOut->addHTML( $this->getToggles( array( 'watchlisthideminor', 'watchlisthidebots', 'watchlisthideown', 'watchlisthideanons', 'watchlisthideliu' ) ) );
 
                if( $wgUser->isAllowed( 'createpage' ) || $wgUser->isAllowed( 'createtalk' ) )
-                       $wgOut->addHtml( $this->getToggle( 'watchcreations' ) );
+                       $wgOut->addHTML( $this->getToggle( 'watchcreations' ) );
                foreach( array( 'edit' => 'watchdefault', 'move' => 'watchmoves', 'delete' => 'watchdeletion' ) as $action => $toggle ) {
                        if( $wgUser->isAllowed( $action ) )
-                               $wgOut->addHtml( $this->getToggle( $toggle ) );
+                               $wgOut->addHTML( $this->getToggle( $toggle ) );
                }
                $this->mUsedToggles['watchcreations'] = true;
                $this->mUsedToggles['watchdefault'] = true;
                $this->mUsedToggles['watchmoves'] = true;
                $this->mUsedToggles['watchdeletion'] = true;
 
-               $wgOut->addHtml( '</fieldset>' );
+               $wgOut->addHTML( '</fieldset>' );
 
                # Search
                $mwsuggest = $wgEnableMWSuggest ?
@@ -1095,8 +1095,8 @@ class PreferencesForm {
                # Misc
                #
                $wgOut->addHTML('<fieldset><legend>' . wfMsg('prefs-misc') . '</legend>');
-               $wgOut->addHtml( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
-               $wgOut->addHtml( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
+               $wgOut->addHTML( '<label for="wpStubs">' . wfMsg( 'stub-threshold' ) . '</label>&nbsp;' );
+               $wgOut->addHTML( Xml::input( 'wpStubs', 6, $this->mStubs, array( 'id' => 'wpStubs' ) ) );
                $msgUnderline = htmlspecialchars( wfMsg ( 'tog-underline' ) );
                $msgUnderlinenever = htmlspecialchars( wfMsg ( 'underline-never' ) );
                $msgUnderlinealways = htmlspecialchars( wfMsg ( 'underline-always' ) );
@@ -1140,7 +1140,7 @@ class PreferencesForm {
        <input type='hidden' name='wpEditToken' value=\"{$token}\" />
        </div></form>\n" );
 
-               $wgOut->addHtml( Xml::tags( 'div', array( 'class' => "prefcache" ),
+               $wgOut->addHTML( Xml::tags( 'div', array( 'class' => "prefcache" ),
                        wfMsgExt( 'clearyourcache', 'parseinline' ) )
                );
        }

diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index 581d4b0..ea0c113 100644 (file)
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -42,7 +42,7 @@ class SpecialPrefixindex extends SpecialAllpages {
                } elseif( isset( $from ) ){
                        $this->showPrefixChunk( $namespace, $from, $from );
                } else {
-                       $wgOut->addHtml( $this->namespacePrefixForm( $namespace, null ) );
+                       $wgOut->addHTML( $this->namespacePrefixForm( $namespace, null ) );
                }
        }
        
@@ -184,6 +184,6 @@ class SpecialPrefixindex extends SpecialAllpages {
                        $out2 .= "</td></tr></table><hr />";
                }
 
-               $wgOut->addHtml( $out2 . $out );
+               $wgOut->addHTML( $out2 . $out );
        }
 }

diff --git a/includes/specials/SpecialResetpass.php b/includes/specials/SpecialResetpass.php
index 707b941..aba0b00 100644 (file)
--- a/includes/specials/SpecialResetpass.php
+++ b/includes/specials/SpecialResetpass.php
@@ -71,7 +71,7 @@ class PasswordResetForm extends SpecialPage {
 
        function error( $msg ) {
                global $wgOut;
-               $wgOut->addHtml( '<div class="errorbox">' .
+               $wgOut->addHTML( '<div class="errorbox">' .
                        htmlspecialchars( $msg ) .
                        '</div>' );
        }
@@ -119,7 +119,7 @@ class PasswordResetForm extends SpecialPage {
                        '</table>' .
                        wfCloseElement( 'form' ) .
                        '</div>';
-               $wgOut->addHtml( $form );
+               $wgOut->addHTML( $form );
        }
 
        function pretty( $fields ) {

diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 7ab45d0..47ecfb3 100644 (file)
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -171,7 +171,7 @@ class RevisionDeleteForm {
                $wgOut->addWikiMsg( 'revdelete-selected', $this->page->getPrefixedText(), $count );
 
                $bitfields = 0;
-               $wgOut->addHtml( "<ul>" );
+               $wgOut->addHTML( "<ul>" );
 
                $where = $revObjs = array();
                $dbr = wfGetDB( DB_SLAVE );
@@ -204,7 +204,7 @@ class RevisionDeleteForm {
                                        $UserAllowed = false;
                                }
                                $revisions++;
-                               $wgOut->addHtml( $this->historyLine( $revObjs[$revid] ) );
+                               $wgOut->addHTML( $this->historyLine( $revObjs[$revid] ) );
                                $bitfields |= $revObjs[$revid]->mDeleted;
                        }
                // The archives...
@@ -245,7 +245,7 @@ class RevisionDeleteForm {
                                        $UserAllowed = false;
                                }
                                $revisions++;
-                               $wgOut->addHtml( $this->historyLine( $revObjs[$timestamp] ) );
+                               $wgOut->addHTML( $this->historyLine( $revObjs[$timestamp] ) );
                                $bitfields |= $revObjs[$timestamp]->mDeleted;
                        }
                }
@@ -254,7 +254,7 @@ class RevisionDeleteForm {
                        return;
                }
                
-               $wgOut->addHtml( "</ul>" );
+               $wgOut->addHTML( "</ul>" );
 
                $wgOut->addWikiMsg( 'revdelete-text' );
 
@@ -278,7 +278,7 @@ class RevisionDeleteForm {
                                $hidden[] = Xml::hidden( 'artimestamp[]', $rev->getTimestamp() );
                }
                $special = SpecialPage::getTitleFor( 'Revisiondelete' );
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
                                'id' => 'mw-revdel-form-revisions' ) ) .
                        Xml::openElement( 'fieldset' ) .
@@ -287,15 +287,15 @@ class RevisionDeleteForm {
                // FIXME: all items checked for just one rev are checked, even if not set for the others
                foreach( $this->checks as $item ) {
                        list( $message, $name, $field ) = $item;
-                       $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+                       $wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
                }
                foreach( $items as $item ) {
-                       $wgOut->addHtml( Xml::tags( 'p', null, $item ) );
+                       $wgOut->addHTML( Xml::tags( 'p', null, $item ) );
                }
                foreach( $hidden as $item ) {
-                       $wgOut->addHtml( $item );
+                       $wgOut->addHTML( $item );
                }
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' ) . "\n"
                );
@@ -317,7 +317,7 @@ class RevisionDeleteForm {
                        $wgLang->formatNum($count) );
 
                $bitfields = 0;
-               $wgOut->addHtml( "<ul>" );
+               $wgOut->addHTML( "<ul>" );
 
                $where = $filesObjs = array();
                $dbr = wfGetDB( DB_SLAVE );
@@ -353,7 +353,7 @@ class RevisionDeleteForm {
                                }
                                $revisions++;
                                // Inject history info
-                               $wgOut->addHtml( $this->fileLine( $filesObjs[$archivename] ) );
+                               $wgOut->addHTML( $this->fileLine( $filesObjs[$archivename] ) );
                                $bitfields |= $filesObjs[$archivename]->deleted;
                        }
                // Archived files...
@@ -384,7 +384,7 @@ class RevisionDeleteForm {
                                }
                                $revisions++;
                                // Inject history info
-                               $wgOut->addHtml( $this->archivedfileLine( $filesObjs[$fileid] ) );
+                               $wgOut->addHTML( $this->archivedfileLine( $filesObjs[$fileid] ) );
                                $bitfields |= $filesObjs[$fileid]->deleted;
                        }
                }
@@ -393,7 +393,7 @@ class RevisionDeleteForm {
                        return;
                }
                
-               $wgOut->addHtml( "</ul>" );
+               $wgOut->addHTML( "</ul>" );
 
                $wgOut->addWikiMsg('revdelete-text' );
                //Normal sysops can always see what they did, but can't always change it
@@ -416,7 +416,7 @@ class RevisionDeleteForm {
                                $hidden[] = Xml::hidden( 'fileid[]', $fileid );
                }
                $special = SpecialPage::getTitleFor( 'Revisiondelete' );
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
                                'id' => 'mw-revdel-form-filerevisions' ) ) .
                        Xml::fieldset( wfMsg( 'revdelete-legend' ) )
@@ -424,16 +424,16 @@ class RevisionDeleteForm {
                // FIXME: all items checked for just one file are checked, even if not set for the others
                foreach( $this->checks as $item ) {
                        list( $message, $name, $field ) = $item;
-                       $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+                       $wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
                }
                foreach( $items as $item ) {
-                       $wgOut->addHtml( "<p>$item</p>" );
+                       $wgOut->addHTML( "<p>$item</p>" );
                }
                foreach( $hidden as $item ) {
-                       $wgOut->addHtml( $item );
+                       $wgOut->addHTML( $item );
                }
 
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' ) . "\n"
                );
@@ -449,7 +449,7 @@ class RevisionDeleteForm {
                $wgOut->addWikiMsg( 'logdelete-selected', $wgLang->formatNum( count($this->events) ) );
 
                $bitfields = 0;
-               $wgOut->addHtml( "<ul>" );
+               $wgOut->addHTML( "<ul>" );
 
                $where = $logRows = array();
                $dbr = wfGetDB( DB_SLAVE );
@@ -480,7 +480,7 @@ class RevisionDeleteForm {
                                $UserAllowed = false;
                        }
                        $logItems++;
-                       $wgOut->addHtml( $this->logLine( $logRows[$logid] ) );
+                       $wgOut->addHTML( $this->logLine( $logRows[$logid] ) );
                        $bitfields |= $logRows[$logid]->log_deleted;
                }
                if( !$logItems ) {
@@ -488,7 +488,7 @@ class RevisionDeleteForm {
                        return;
                }
                
-               $wgOut->addHtml( "</ul>" );
+               $wgOut->addHTML( "</ul>" );
 
                $wgOut->addWikiMsg( 'revdelete-text' );
                // Normal sysops can always see what they did, but can't always change it
@@ -506,7 +506,7 @@ class RevisionDeleteForm {
                }
 
                $special = SpecialPage::getTitleFor( 'Revisiondelete' );
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $special->getLocalUrl( 'action=submit' ), 
                                'id' => 'mw-revdel-form-logs' ) ) .
                        Xml::fieldset( wfMsg( 'revdelete-legend' ) )
@@ -514,16 +514,16 @@ class RevisionDeleteForm {
                // FIXME: all items checked for just on event are checked, even if not set for the others
                foreach( $this->checks as $item ) {
                        list( $message, $name, $field ) = $item;
-                       $wgOut->addHtml( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
+                       $wgOut->addHTML( Xml::tags( 'div', null, Xml::checkLabel( wfMsg( $message ), $name, $name, $bitfields & $field ) ) );
                }
                foreach( $items as $item ) {
-                       $wgOut->addHtml( "<p>$item</p>" );
+                       $wgOut->addHTML( "<p>$item</p>" );
                }
                foreach( $hidden as $item ) {
-                       $wgOut->addHtml( $item );
+                       $wgOut->addHTML( $item );
                }
 
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::closeElement( 'fieldset' ) .
                        Xml::closeElement( 'form' ) . "\n"
                );

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 3ee0bf1..f9d08f9 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -255,7 +255,7 @@ class SpecialSearch {
                        }
                        // show interwiki results if any
                        if( $textMatches->hasInterwikiResults() )
-                               $wgOut->addHtml( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
+                               $wgOut->addHTML( $this->showInterwiki( $textMatches->getInterwikiResults(), $term ));
                        // show results
                        if( $textMatches->numRows() )
                                $wgOut->addHTML( $this->showMatches( $textMatches ) );

diff --git a/includes/specials/SpecialStatistics.php b/includes/specials/SpecialStatistics.php
index fa81fca..fdd713c 100644 (file)
--- a/includes/specials/SpecialStatistics.php
+++ b/includes/specials/SpecialStatistics.php
@@ -165,7 +165,7 @@ function wfSpecialStatistics( $par = '' ) {
                $text .= "\n" . $footer;
        }
 
-       $wgOut->addHtml( $text );
+       $wgOut->addHTML( $text );
 }
 
 /**

diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index d96c292..69e8076 100644 (file)
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -679,7 +679,7 @@ class UndeleteForm {
                global $wgOut, $wgScript;
                $wgOut->addWikiMsg( 'undelete-header' );
 
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        Xml::openElement( 'form', array(
                                'method' => 'get',
                                'action' => $wgScript ) ) .
@@ -718,7 +718,7 @@ class UndeleteForm {
                        $revs = wfMsgExt( 'undeleterevisions',
                                array( 'parseinline' ),
                                $wgLang->formatNum( $row->count ) );
-                       $wgOut->addHtml( "<li>{$link} ({$revs})</li>\n" );
+                       $wgOut->addHTML( "<li>{$link} ({$revs})</li>\n" );
                }
                $result->free();
                $wgOut->addHTML( "</ul>\n" );
@@ -766,10 +766,10 @@ class UndeleteForm {
                                if( $wgUser->getOption( 'diffonly' ) ) {
                                        return;
                                } else {
-                                       $wgOut->addHtml( '<hr />' );
+                                       $wgOut->addHTML( '<hr />' );
                                }
                        } else {
-                               $wgOut->addHtml( wfMsgHtml( 'undelete-nodiff' ) );
+                               $wgOut->addHTML( wfMsgHtml( 'undelete-nodiff' ) );
                        }
                }
 
@@ -780,12 +780,12 @@ class UndeleteForm {
                $t = htmlspecialchars( $wgLang->time( $timestamp, true ) );
                $user = $skin->revUserTools( $rev );
 
-               $wgOut->addHtml( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</p>' );
+               $wgOut->addHTML( '<p>' . wfMsgHtml( 'undelete-revision', $link, $time, $user, $d, $t ) . '</p>' );
 
                wfRunHooks( 'UndeleteShowRevision', array( $this->mTargetObj, $rev ) );
 
                if( $this->mPreview ) {
-                       $wgOut->addHtml( "<hr />\n" );
+                       $wgOut->addHTML( "<hr />\n" );
 
                        //Hide [edit]s
                        $popts = $wgOut->parserOptions();
@@ -794,7 +794,7 @@ class UndeleteForm {
                        $wgOut->addWikiTextTitleTidy( $rev->getText( Revision::FOR_THIS_USER ), $this->mTargetObj, true );
                }
 
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        wfElement( 'textarea', array(
                                        'readonly' => 'readonly',
                                        'cols' => intval( $wgUser->getOption( 'cols' ) ),
@@ -840,7 +840,7 @@ class UndeleteForm {
 
                $diffEngine = new DifferenceEngine();
                $diffEngine->showDiffStyle();
-               $wgOut->addHtml(
+               $wgOut->addHTML(
                        "<div>" .
                        "<table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>" .
                        "<col class='diff-marker' />" .
@@ -972,7 +972,7 @@ class UndeleteForm {
                        $action = $titleObj->getLocalURL( "action=submit" );
                        # Start the form here
                        $top = Xml::openElement( 'form', array( 'method' => 'post', 'action' => $action, 'id' => 'undelete' ) );
-                       $wgOut->addHtml( $top );
+                       $wgOut->addHTML( $top );
                }
 
                # Show relevant lines from the deletion log:
@@ -1023,7 +1023,7 @@ class UndeleteForm {
                                Xml::closeElement( 'table' ) .
                                Xml::closeElement( 'fieldset' );
 
-                       $wgOut->addHtml( $table );
+                       $wgOut->addHTML( $table );
                }
 
                $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'history' ) ) . "\n" );
@@ -1046,8 +1046,8 @@ class UndeleteForm {
                }
 
                if( $haveFiles ) {
-                       $wgOut->addHtml( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
-                       $wgOut->addHtml( "<ul>" );
+                       $wgOut->addHTML( Xml::element( 'h2', null, wfMsg( 'filehist' ) ) . "\n" );
+                       $wgOut->addHTML( "<ul>" );
                        while( $row = $files->fetchObject() ) {
                                $wgOut->addHTML( $this->formatFileRow( $row, $sk ) );
                        }
@@ -1060,7 +1060,7 @@ class UndeleteForm {
                        $misc  = Xml::hidden( 'target', $this->mTarget );
                        $misc .= Xml::hidden( 'wpEditToken', $wgUser->editToken() );
                        $misc .= Xml::closeElement( 'form' );
-                       $wgOut->addHtml( $misc );
+                       $wgOut->addHTML( $misc );
                }
 
                return true;
@@ -1268,10 +1268,10 @@ class UndeleteForm {
 
                                $skin = $wgUser->getSkin();
                                $link = $skin->makeKnownLinkObj( $this->mTargetObj );
-                               $wgOut->addHtml( wfMsgWikiHtml( 'undeletedpage', $link ) );
+                               $wgOut->addHTML( wfMsgWikiHtml( 'undeletedpage', $link ) );
                        } else {
                                $wgOut->showFatalError( wfMsg( "cannotundelete" ) );
-                               $wgOut->addHtml( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
+                               $wgOut->addHTML( '<p>' . wfMsgHtml( "undeleterevdel" ) . '</p>' );
                        }
 
                        // Show file deletion warnings and errors

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 51b11df..9d6595d 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -966,7 +966,7 @@ wgUploadAutoFill = {$autofill};
                                                wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $count )
                                        )
                                );
-                               $wgOut->addHtml( "<div id=\"contentSub2\">{$link}</div>" );
+                               $wgOut->addHTML( "<div id=\"contentSub2\">{$link}</div>" );
                        }
 
                        // Show the relevant lines from deletion log (for still deleted files only)
@@ -1162,7 +1162,7 @@ wgUploadAutoFill = {$autofill};
                                <tr>"
                        );
                        if( $useAjaxLicensePreview ) {
-                               $wgOut->addHtml( "
+                               $wgOut->addHTML( "
                                                <td></td>
                                                <td id=\"mw-license-preview\"></td>
                                        </tr>
@@ -1198,7 +1198,7 @@ wgUploadAutoFill = {$autofill};
                        );
                }
 
-               $wgOut->addHtml( "
+               $wgOut->addHTML( "
                                <td></td>
                                <td>
                                        <input tabindex='7' type='checkbox' name='wpWatchthis' id='wpWatchthis' $watchChecked value='true' />
@@ -1735,14 +1735,14 @@ wgUploadAutoFill = {$autofill};
                $loglist = new LogEventsList( $wgUser->getSkin(), $out );
                $pager = new LogPager( $loglist, 'delete', false, $filename );
                if( $pager->getNumRows() > 0 ) {
-                       $out->addHtml( '<div class="mw-warning-with-logexcerpt">' );
+                       $out->addHTML( '<div class="mw-warning-with-logexcerpt">' );
                        $out->addWikiMsg( 'upload-wasdeleted' );
                        $out->addHTML(
                                $loglist->beginLogEventsList() .
                                $pager->getBody() .
                                $loglist->endLogEventsList()
                        );
-                       $out->addHtml( '</div>' );
+                       $out->addHTML( '</div>' );
                }
        }
 }

diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 813cf46..e26df31 100644 (file)
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -196,7 +196,7 @@ class LoginForm {
                        $wgOut->setPageTitle( wfMsgHtml( 'accountcreated' ) );
                        $wgOut->setArticleRelated( false );
                        $wgOut->setRobotPolicy( 'noindex,nofollow' );
-                       $wgOut->addHtml( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
+                       $wgOut->addHTML( wfMsgWikiHtml( 'accountcreatedtext', $u->getName() ) );
                        $wgOut->returnToMain( false, $self );
                        wfRunHooks( 'AddNewAccount', array( $u ) );
                        $u->addNewUserLogEntry();
@@ -732,7 +732,7 @@ class LoginForm {
                $wgOut->setRobotPolicy( 'noindex,nofollow' );
                $wgOut->setArticleRelated( false );
                $wgOut->addWikiMsg( $msgname, $wgUser->getName() );
-               $wgOut->addHtml( $injected_html );
+               $wgOut->addHTML( $injected_html );
 
                if ( !empty( $this->mReturnTo ) ) {
                        $wgOut->returnToMain( null, $this->mReturnTo );

diff --git a/includes/specials/SpecialUserrights.php b/includes/specials/SpecialUserrights.php
index f0ad542..38169cc 100644 (file)
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -623,7 +623,7 @@ class UserrightsPage extends SpecialPage {
         * @param $output OutputPage to use
         */
        protected function showLogFragment( $user, $output ) {
-               $output->addHtml( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) );
+               $output->addHTML( Xml::element( 'h2', null, LogPage::logName( 'rights' ) . "\n" ) );
                LogEventsList::showLogExtract( $output, 'rights', $user->getUserPage()->getPrefixedText() );
        }
 }

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 737d7f3..bd509ac 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -24,7 +24,7 @@ function wfSpecialWatchlist( $par ) {
                $wgOut->setPageTitle( wfMsg( 'watchnologin' ) );
                $llink = $skin->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogin' ), 
                        wfMsgHtml( 'loginreqlink' ), 'returnto=' . $specialTitle->getPrefixedUrl() );
-               $wgOut->addHtml( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
+               $wgOut->addHTML( wfMsgWikiHtml( 'watchlistanontext', $llink ) );
                return;
        }
 
@@ -307,7 +307,7 @@ function wfSpecialWatchlist( $par ) {
                $form .= Xml::hidden( 'hideOwn', 1 );
        $form .= Xml::closeElement( 'form' );
        $form .= Xml::closeElement( 'fieldset' );
-       $wgOut->addHtml( $form );
+       $wgOut->addHTML( $form );
 
        # If there's nothing to show, stop here
        if( $numRows == 0 ) {