diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2024-01-05 16:35:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2024-01-05 16:35:56 +0000 |
| commit | b5d297e39090ae0a6b849d8c427aacc5e976260c (patch) | |
| tree | 4436f1d7915b81d974c0acffc1302a32ebef064f /includes/content | |
| parent | c5097a616732cb08c3080a73b17d613acf5b45ce (diff) | |
| parent | 93b3710c1481849ba1bd695322a8e577ca361b4b (diff) | |
| download | mediawikicore-b5d297e39090ae0a6b849d8c427aacc5e976260c.tar.gz mediawikicore-b5d297e39090ae0a6b849d8c427aacc5e976260c.zip | |
Merge "Skip TextContentHandler::merge3() when texts are identical"
Diffstat (limited to 'includes/content')
| -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() ); |