dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add namespace restrictions to `meta=siteinfo&siprop=namespaces` API result"
[lhc/web/wiklou.git]
/
includes
/
Storage
/
DerivedPageDataUpdater.php
diff --git
a/includes/Storage/DerivedPageDataUpdater.php
b/includes/Storage/DerivedPageDataUpdater.php
index
5d847b6
..
b2c003a
100644
(file)
--- a/
includes/Storage/DerivedPageDataUpdater.php
+++ b/
includes/Storage/DerivedPageDataUpdater.php
@@
-659,7
+659,7
@@
class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
$hasLinks = (bool)count( $this->getCanonicalParserOutput()->getLinks() );
}
$hasLinks = (bool)count( $this->getCanonicalParserOutput()->getLinks() );
}
- foreach ( $this->get
Modified
SlotRoles() as $role ) {
+ foreach ( $this->get
Slots()->get
SlotRoles() as $role ) {
$roleHandler = $this->slotRoleRegistry->getRoleHandler( $role );
if ( $roleHandler->supportsArticleCount() ) {
$content = $this->getRawContent( $role );
$roleHandler = $this->slotRoleRegistry->getRoleHandler( $role );
if ( $roleHandler->supportsArticleCount() ) {
$content = $this->getRawContent( $role );
@@
-1208,7
+1208,8
@@
class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
}
// "created" is forced here
}
// "created" is forced here
- $this->options['created'] = ( $this->pageState['oldId'] === 0 );
+ $this->options['created'] = ( $this->options['created'] ||
+ ( $this->pageState['oldId'] === 0 ) );
$this->revision = $revision;
$this->revision = $revision;
@@
-1484,7
+1485,6
@@
class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
$id = $this->getPageId();
$title = $this->getTitle();
$id = $this->getPageId();
$title = $this->getTitle();
- $dbKey = $title->getPrefixedDBkey();
$shortTitle = $title->getDBkey();
if ( !$title->exists() ) {
$shortTitle = $title->getDBkey();
if ( !$title->exists() ) {
@@
-1522,7
+1522,7
@@
class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
// TODO: make search infrastructure aware of slots!
$mainSlot = $this->revision->getSlot( SlotRecord::MAIN );
if ( !$mainSlot->isInherited() && !$this->isContentDeleted() ) {
// TODO: make search infrastructure aware of slots!
$mainSlot = $this->revision->getSlot( SlotRecord::MAIN );
if ( !$mainSlot->isInherited() && !$this->isContentDeleted() ) {
- DeferredUpdates::addUpdate( new SearchUpdate( $id, $
dbKey
, $mainSlot->getContent() ) );
+ DeferredUpdates::addUpdate( new SearchUpdate( $id, $
title
, $mainSlot->getContent() ) );
}
// If this is another user's talk page, update newtalk.
}
// If this is another user's talk page, update newtalk.
@@
-1531,7
+1531,9
@@
class DerivedPageDataUpdater implements IDBAccessObject, LoggerAwareInterface {
if ( $this->options['changed']
&& $title->getNamespace() == NS_USER_TALK
&& $shortTitle != $legacyUser->getTitleKey()
if ( $this->options['changed']
&& $title->getNamespace() == NS_USER_TALK
&& $shortTitle != $legacyUser->getTitleKey()
- && !( $this->revision->isMinor() && $legacyUser->isAllowed( 'nominornewtalk' ) )
+ && !( $this->revision->isMinor() && MediaWikiServices::getInstance()
+ ->getPermissionManager()
+ ->userHasRight( $legacyUser, 'nominornewtalk' ) )
) {
$recipient = User::newFromName( $shortTitle, false );
if ( !$recipient ) {
) {
$recipient = User::newFromName( $shortTitle, false );
if ( !$recipient ) {