merged from master

diff --cc docs/hooks.txt
Simple merge

diff --cc includes/AutoLoader.php
Simple merge

diff --cc includes/DefaultSettings.php
Simple merge

diff --cc includes/EditPage.php
index 1cceee0,015099a..105590f
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -1090,14 -985,8 +1085,13 @@@ class EditPage 
                                return true;
  
                        case self::AS_HOOK_ERROR:
-                       case self::AS_FILTERING:
                                return false;
  
 +                      case self::AS_PARSE_ERROR:
 +                              $wgOut->addWikiText( '<div class="error">' . $status->getWikiText() . '</div>');
 +                              #FIXME: cause editform to be shown again, not just an error!
 +                              return false;
 +
                        case self::AS_SUCCESS_NEW_ARTICLE:
                                $query = $resultDetails['redirect'] ? 'redirect=no' : '';
                                $anchor = isset ( $resultDetails['sectionanchor'] ) ? $resultDetails['sectionanchor'] : '';

diff --cc includes/ImagePage.php
Simple merge

diff --cc includes/Title.php
Simple merge

diff --cc includes/WikiPage.php
Simple merge

diff --cc includes/api/ApiDelete.php
Simple merge

diff --cc includes/api/ApiEditPage.php
Simple merge

diff --cc includes/api/ApiParse.php
index bb079dd,c2bdeb1..b85f0ff
--- 1/includes/api/ApiParse.php
--- 2/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@@ -328,9 -328,11 +328,12 @@@ class ApiParse extends ApiBase 
                        // Try the parser cache first
                        // getParserOutput will save to Parser cache if able
                        $pout = $page->getParserOutput( $popts );
+                       if ( !$pout ) {
+                               $this->dieUsage( "There is no revision ID {$page->getLatest()}", 'missingrev' );
+                       }
                        if ( $getWikitext ) {
 -                              $this->text = $page->getRawText();
 +                $this->content = $page->getContent( Revision::RAW ); #FIXME: use $this->content everywhere
 +                              $this->text = ContentHandler::getContentText( $this->content ); #FIXME: serialize, get format from params; or use object structure in result?
                        }
                        return $pout;
                }

diff --cc includes/resourceloader/ResourceLoaderWikiModule.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc maintenance/refreshLinks.php
index 20a8043,26d7e29..2de851a
--- 1/maintenance/refreshLinks.php
--- 2/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@@ -212,8 -210,8 +210,8 @@@ class RefreshLinks extends Maintenance 
                        return;
                }
  
-               $revision = Revision::newFromTitle( $title );
-               if ( !$revision ) {
 -              $text = $page->getRawText();
 -              if ( $text === false ) {
++              $content = $page->getContent( REVISION::RAW );
++              if ( null === false ) {
                        return;
                }
  
@@@ -220,15 -219,10 +219,13 @@@
                $dbw->begin( __METHOD__ );
  
                $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
-               $parserOutput = $wgParser->parse( $revision->getText(), $title, $options, true, true, $revision->getId() );
 -              $parserOutput = $wgParser->parse( $text, $page->getTitle(), $options, true, true, $page->getLatest() );
 -              $update = new LinksUpdate( $page->getTitle(), $parserOutput, false );
 -              $update->doUpdate();
++              $context = RequestContext::getMain();
++
++              $parserOutput = $content->getParserOutput( $context, $page->getLatest(), $options, false );
 +
-         $updates = $parserOutput->getSecondaryDataUpdates( $title, false );
-         SecondaryDataUpdate::runUpdates( $updates );
++              $updates = $parserOutput->getSecondaryDataUpdates( $page->getTitle(), false );
++              SecondaryDataUpdate::runUpdates( $updates );
  
-         $dbw->commit();
-         // TODO: We don't know what happens here.
-               $update = new LinksUpdate( $title, $parserOutput, false );
-               $update->doUpdate();
                $dbw->commit( __METHOD__ );
        }
  

diff --cc tests/phpunit/phpunit.php
index d18b33b,e3f780b..e3f780b
mode 100644,100755..100644
--- 1/tests/phpunit/phpunit.php
--- 2/tests/phpunit/phpunit.php
+++ b/tests/phpunit/phpunit.php