Merge "Merge branch 'Wikidata' into master."

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 53f6da1..f0fd067 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2058,7 +2058,7 @@ class OutputPage extends ContextSource {
                $this->prepareErrorPage( $title );
 
                if ( $msg instanceof Message ){
-                       $this->addHTML( $msg->parse() );
+                       $this->addHTML( $msg->parseAsBlock() );
                } else {
                        $this->addWikiMsgArray( $msg, $params );
                }

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index e09cd20..468e21b 100644 (file)
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -72,8 +72,7 @@ class InfoAction extends FormlessAction {
                        '.mw-templatesUsedExplanation { display: none; }' );
 
                // Get page information
-               $title = $this->getTitle();
-               $pageInfo = $this->pageInfo( $title );
+               $pageInfo = $this->pageInfo();
 
                // Allow extensions to add additional information
                wfRunHooks( 'InfoAction', array( &$pageInfo ) );
@@ -96,7 +95,7 @@ class InfoAction extends FormlessAction {
                }
 
                // Page credits
-               /*if ( $title->exists() ) {
+               /*if ( $this->page->exists() ) {
                        $content .= Html::rawElement( 'div', array( 'id' => 'mw-credits' ), $this->getContributors() );
                }*/
 
@@ -146,10 +145,8 @@ class InfoAction extends FormlessAction {
         * Returns page information in an easily-manipulated format. Array keys are used so extensions
         * may add additional information in arbitrary positions. Array values are arrays with one
         * element to be rendered as a header, arrays with two elements to be rendered as a table row.
-        *
-        * @param $title Title object
         */
-       protected function pageInfo( $title ) {
+       protected function pageInfo() {
                global $wgContLang, $wgDisableCounters, $wgRCMaxAge;
 
                $user = $this->getUser();