Revert r23395, since it won't work (d'oh, of course)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cbc8e45..ed5674f 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -387,10 +387,8 @@ class OutputPage {
                $this->mTemplateIds += (array)$parserOutput->mTemplateIds;
                
                # Display title
-               if( is_callable( array( $parserOutput, 'getDisplayTitle' ) ) ) {
-                       if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
-                               $this->setPageTitle( $dt );
-               }
+               if( ( $dt = $parserOutput->getDisplayTitle() ) !== false )
+                       $this->setPageTitle( $dt );
                
                wfRunHooks( 'OutputPageParserOutput', array( &$this, $parserOutput ) );
        }

diff --git a/includes/Parser.php b/includes/Parser.php
index 50f9ac1..e4418cd 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -12,7 +12,7 @@
  * changes in an incompatible way, so the parser cache
  * can automatically discard old data.
  */
-define( 'MW_PARSER_VERSION', '1.6.1' );
+define( 'MW_PARSER_VERSION', '1.6.2' );
 
 define( 'RLH_FOR_UPDATE', 1 );