renamed getDifferenceEngine to createDifferenceEngine

9 files changed, 10 insertions, 11 deletions

diff --git a/includes/Article.php b/includes/Article.php
index dbdae4c8b166..249344886d50 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -744,7 +744,7 @@ class Article extends Page {
 		$oldid = $this->getOldID();
 
 		$contentHandler = ContentHandler::getForTitle( $this->getTitle() );
-		$de = $contentHandler->getDifferenceEngine( $this->getContext(), $oldid, $diff, $rcid, $purge, $unhide );
+		$de = $contentHandler->createDifferenceEngine( $this->getContext(), $oldid, $diff, $rcid, $purge, $unhide );
 
 		// DifferenceEngine directly fetched the revision:
 		$this->mRevIdFetched = $de->mNewid;
diff --git a/includes/ContentHandler.php b/includes/ContentHandler.php
index 8f3c6eec3b26..9ee33c9c899e 100644
--- a/includes/ContentHandler.php
+++ b/includes/ContentHandler.php
@@ -420,9 +420,8 @@ abstract class ContentHandler {
      * @param $unhide boolean If set, allow viewing deleted revs
 	 *
 	 * @return DifferenceEngine
-     * @todo rename to createDifferenceEngine for consistency.
      */
-    public function getDifferenceEngine( IContextSource $context, $old = 0, $new = 0, $rcid = 0, #FIMXE: use everywhere!
+    public function createDifferenceEngine( IContextSource $context, $old = 0, $new = 0, $rcid = 0, #FIMXE: use everywhere!
                                          $refreshCache = false, $unhide = false ) {
 
         $this->checkModelName( $context->getTitle()->getModelName() );
diff --git a/includes/EditPage.php b/includes/EditPage.php
index a0cf4219f716..ed3e9d2dffd7 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -2598,7 +2598,7 @@ HTML
 			$content2 = ContentHandler::makeContent( $this->textbox2, $this->getTitle(), $this->content_model, $this->content_format ); #XXX: handle parse errors?
 
 			$handler = ContentHandler::getForModelName( $this->content_model );
-			$de = $handler->getDifferenceEngine( $this->mArticle->getContext() );
+			$de = $handler->createDifferenceEngine( $this->mArticle->getContext() );
 			$de->setContent( $content2, $content1 );
 			$de->showDiff( wfMsgExt( 'yourtext', 'parseinline' ), wfMsg( 'storedversion' ) );
 
diff --git a/includes/FeedUtils.php b/includes/FeedUtils.php
index bb474399a7f7..8a01ab8670ac 100644
--- a/includes/FeedUtils.php
+++ b/includes/FeedUtils.php
@@ -118,7 +118,7 @@ class FeedUtils {
 			// Don't bother generating the diff if we won't be able to show it
 			if ( $wgFeedDiffCutoff > 0 ) {
                 $contentHandler = ContentHandler::getForTitle( $title );
-                $de = $contentHandler->getDifferenceEngine( $title, $oldid, $newid );
+                $de = $contentHandler->createDifferenceEngine( $title, $oldid, $newid );
 				$diffText = $de->getDiff(
 					wfMsg( 'previousrevision' ), // hack
 					wfMsg( 'revisionasof',
diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index 5aba0b52f17a..5c85d530b749 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -110,7 +110,7 @@ class RollbackAction extends FormlessAction {
 
 		if ( !$request->getBool( 'hidediff', false ) && !$this->getUser()->getBoolOption( 'norollbackdiff', false ) ) {
             $contentHandler = ContentHandler::getForTitle( $this->getTitle() );
-            $de = $contentHandler->getDifferenceEngine( $this->getContext(), $current->getId(), $newId, false, true );
+            $de = $contentHandler->createDifferenceEngine( $this->getContext(), $current->getId(), $newId, false, true );
 			$de->showDiff( '', '' );
 		}
 	}
diff --git a/includes/api/ApiComparePages.php b/includes/api/ApiComparePages.php
index 1fac9962ef2f..cd50030007c1 100644
--- a/includes/api/ApiComparePages.php
+++ b/includes/api/ApiComparePages.php
@@ -36,7 +36,7 @@ class ApiComparePages extends ApiBase {
 		$rev2 = $this->revisionOrTitleOrId( $params['torev'], $params['totitle'], $params['toid'] );
 
         $contentHandler = ContentHandler::getForModelName( $rev1->getContentModelName() );
-        $de = $contentHandler->getDifferenceEngine( $this->getContext(),
+        $de = $contentHandler->createDifferenceEngine( $this->getContext(),
 			$rev1,
 			$rev2,
 			null, // rcid
diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index 11ea37100d48..f5cb72bc07ac 100644
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -506,10 +506,10 @@ class ApiQueryRevisions extends ApiQueryBase {
                 $handler = ContentHandler::getForTitle( $title );
 
 				if ( !is_null( $this->difftotext ) ) {
-					$engine = $handler->getDifferenceEngine( $context );
+					$engine = $handler->createDifferenceEngine( $context );
 					$engine->setText( $text, $this->difftotext ); #FIXME: use content objects!...
 				} else {
-					$engine = $handler->getDifferenceEngine( $context, $revision->getID(), $this->diffto );
+					$engine = $handler->createDifferenceEngine( $context, $revision->getID(), $this->diffto );
 					$vals['diff']['from'] = $engine->getOldid();
 					$vals['diff']['to'] = $engine->getNewid();
 				}
diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php
index 878bda041683..ba433c82d339 100644
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@ -112,7 +112,7 @@ class SpecialComparePages extends SpecialPage {
 
 		if( $rev1 && $rev2 ) {
             $contentHandler = ContentHandler::getForModelName( $rev1->getContentModelName() );
-			$de = $contentHandler->getDifferenceEngine( $form->getContext(),
+			$de = $contentHandler->createDifferenceEngine( $form->getContext(),
 				$rev1,
 				$rev2,
 				null, // rcid
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 47e88d0e85bc..c2ca7ce0e702 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -898,7 +898,7 @@ class SpecialUndelete extends SpecialPage {
 	 */
 	function showDiff( $previousRev, $currentRev ) {
         $contentHandler = ContentHandler::getForTitle( $this->getTitle() );
-		$diffEngine = $contentHandler->getDifferenceEngine( $this->getContext() );
+		$diffEngine = $contentHandler->createDifferenceEngine( $this->getContext() );
 		$diffEngine->showDiffStyle();
 		$this->getOutput()->addHTML(
 			"<div>" .