From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 17 Aug 2019 09:27:34 +0000 (+0000)
Subject: Merge "Remove title protection correctly for undeletions and imports"
X-Git-Tag: 1.34.0-rc.0~692
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=e09547f59b7855f82078c5b1609be214cdce659d;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Remove title protection correctly for undeletions and imports"
---

e09547f59b7855f82078c5b1609be214cdce659d
diff --combined includes/Storage/DerivedPageDataUpdater.php
index ca99a7bf0a,f49ea60a28..4903cf0095
--- a/includes/Storage/DerivedPageDataUpdater.php
+++ b/includes/Storage/DerivedPageDataUpdater.php
@@@ -659,7 -659,7 +659,7 @@@ class DerivedPageDataUpdater implement
  			$hasLinks = (bool)count( $this->getCanonicalParserOutput()->getLinks() );
  		}
  
 -		foreach ( $this->getModifiedSlotRoles() as $role ) {
 +		foreach ( $this->getSlots()->getSlotRoles() as $role ) {
  			$roleHandler = $this->slotRoleRegistry->getRoleHandler( $role );
  			if ( $roleHandler->supportsArticleCount() ) {
  				$content = $this->getRawContent( $role );
@@@ -1208,7 -1208,8 +1208,8 @@@
  		}
  
  		// "created" is forced here
- 		$this->options['created'] = ( $this->pageState['oldId'] === 0 );
+ 		$this->options['created'] = ( $this->options['created'] ||
+ 						( $this->pageState['oldId'] === 0 ) );
  
  		$this->revision = $revision;