X-Git-Url: http://git.cyclocoop.org/%24action?a=blobdiff_plain;f=includes%2FOutputPage.php;h=8f86b6e65709ce946ade5c2da259f8923cc6097d;hb=392af46809d831514f49618cdef1e1529d7fddf4;hp=bf70467cfd79fc9570a79e4c023ee6bfc94765fb;hpb=ef5d00345fbba4f77ffaf1e9cbf5ca232159a66d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index bf70467cfd..8f86b6e657 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1725,7 +1725,7 @@ class OutputPage extends ContextSource {
 	/**
 	 * Return a Vary: header on which to vary caches. Based on the keys of $mVaryHeader,
 	 * such as Accept-Encoding or Cookie
-	 * 
+	 *
 	 * @return String
 	 */
 	public function getVaryHeader() {
@@ -2000,7 +2000,11 @@ class OutputPage extends ContextSource {
 		}
 
 		$this->sendCacheControl();
+
+		wfRunHooks( 'AfterFinalPageOutput', array( &$this ) );
+
 		ob_end_flush();
+
 		wfProfileOut( __METHOD__ );
 	}
 
@@ -2053,13 +2057,18 @@ class OutputPage extends ContextSource {
 	 *
 	 * showErrorPage( 'titlemsg', 'pagetextmsg', array( 'param1', 'param2' ) );
 	 * showErrorPage( 'titlemsg', $messageObject );
+	 * showErrorPage( $titleMessageObj, $messageObject );
 	 *
-	 * @param $title String: message key for page title
+	 * @param $title Mixed: message key (string) for page title, or a Message object
 	 * @param $msg Mixed: message key (string) for page text, or a Message object
 	 * @param $params Array: message parameters; ignored if $msg is a Message object
 	 */
 	public function showErrorPage( $title, $msg, $params = array() ) {
-		$this->prepareErrorPage( $this->msg( $title ), $this->msg( 'errorpagetitle' ) );
+		if( !$title instanceof Message ) {
+			$title = $this->msg( $title );
+		}
+
+		$this->prepareErrorPage( $title, $this->msg( 'errorpagetitle' ) );
 
 		if ( $msg instanceof Message ){
 			$this->addHTML( $msg->parse() );
@@ -2346,7 +2355,7 @@ $templates
 	 * Add a "return to" link pointing to a specified title
 	 *
 	 * @param $title Title to link
-	 * @param $query String query string
+	 * @param $query Array query string parameters
 	 * @param $text String text of the link (input is not escaped)
 	 */
 	public function addReturnTo( $title, $query = array(), $text = null ) {
@@ -2386,7 +2395,7 @@ $templates
 			$titleObj = Title::newMainPage();
 		}
 
-		$this->addReturnTo( $titleObj, $returntoquery );
+		$this->addReturnTo( $titleObj, wfCgiToArray( $returntoquery ) );
 	}
 
 	/**
@@ -3516,7 +3525,7 @@ $templates
 	 * Add a wikitext-formatted message to the output.
 	 * This is equivalent to:
 	 *
-	 *    $wgOut->addWikiText( wfMsgNoTrans( ... ) )
+	 *    $wgOut->addWikiText( wfMessage( ... )->plain() )
 	 */
 	public function addWikiMsg( /*...*/ ) {
 		$args = func_get_args();