diff options
| -rw-r--r-- | includes/content/TextContentHandler.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/includes/content/TextContentHandler.php b/includes/content/TextContentHandler.php index 69f42e4d38b3..7370c7bddee6 100644 --- a/includes/content/TextContentHandler.php +++ b/includes/content/TextContentHandler.php @@ -72,6 +72,11 @@ class TextContentHandler extends ContentHandler { * @return Content|false */ public function merge3( Content $oldContent, Content $myContent, Content $yourContent ) { + // No need for an expensive merge when the texts are identical anyway + if ( $myContent->equals( $yourContent ) ) { + return $myContent; + } + $this->checkModelID( $oldContent->getModel() ); $this->checkModelID( $myContent->getModel() ); $this->checkModelID( $yourContent->getModel() ); |