wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-24 00:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Allow maintenance script to work even when DiscussionToolsEnablePermalinksBackend is off"

Browse source
This commit is contained in:
jenkins-bot 2023-04-17 09:18:31 +00:00 committed by Gerrit Code Review
parent 4b843866f7 0d21df43dc
commit 0df02e1c71
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/Hooks/DataUpdatesHooks.php
View file

@ -45,7 +45,9 @@ class DataUpdatesHooks implements RevisionDataUpdatesHook {
$updates[] = new MWCallableUpdate( function () use ( $rev, $method ) { $updates[] = new MWCallableUpdate( function () use ( $rev, $method ) {
try { try {
$threadItemSet = HookUtils::parseRevisionParsoidHtml( $rev, $method ); $threadItemSet = HookUtils::parseRevisionParsoidHtml( $rev, $method );
$this->threadItemStore->insertThreadItems( $rev, $threadItemSet ); if ( !$this->threadItemStore->isDisabled() ) {
$this->threadItemStore->insertThreadItems( $rev, $threadItemSet );
}
} catch ( Throwable $e ) { } catch ( Throwable $e ) {
// Catch errors, so that they don't cause other updates to fail (T315383), but log them. // Catch errors, so that they don't cause other updates to fail (T315383), but log them.
MWExceptionHandler::logException( $e ); MWExceptionHandler::logException( $e );

4
includes/ThreadItemStore.php
View file

@ -61,7 +61,7 @@ class ThreadItemStore {
* *
* @return bool * @return bool
*/ */
private function isDisabled(): bool { public function isDisabled(): bool {
return !$this->config->get( 'DiscussionToolsEnablePermalinksBackend' ); return !$this->config->get( 'DiscussionToolsEnablePermalinksBackend' );
} }
@ -349,7 +349,7 @@ class ThreadItemStore {
* @return bool * @return bool
*/ */
public function insertThreadItems( RevisionRecord $rev, ThreadItemSet $threadItemSet ): bool { public function insertThreadItems( RevisionRecord $rev, ThreadItemSet $threadItemSet ): bool {
if ( $this->isDisabled() || $this->readOnlyMode->isReadOnly() ) { if ( $this->readOnlyMode->isReadOnly() ) {
return false; return false;
} }

2
maintenance/persistRevisionThreadItems.php
View file

@ -191,7 +191,7 @@ class PersistRevisionThreadItems extends Maintenance {
if ( HookUtils::isAvailableForTitle( $title ) ) { if ( HookUtils::isAvailableForTitle( $title ) ) {
$threadItemSet = HookUtils::parseRevisionParsoidHtml( $rev, false ); $threadItemSet = HookUtils::parseRevisionParsoidHtml( $rev, false );
// Store permalink data // Store permalink data (even when store is disabled - T334258)
$changed = $this->itemStore->insertThreadItems( $rev, $threadItemSet ); $changed = $this->itemStore->insertThreadItems( $rev, $threadItemSet );
} }
} catch ( Throwable $e ) { } catch ( Throwable $e ) {