if ( $samePage && $this->mNewPage && $permissionManager->quickUserCan(
'edit', $user, $this->mNewPage
) ) {
- if ( $this->mNewRev->isCurrent() && $permissionManager->userCan(
+ if ( $this->mNewRev->isCurrent() && $permissionManager->quickUserCan(
'rollback', $user, $this->mNewPage
) ) {
$rollbackLink = Linker::generateRollback( $this->mNewRev, $this->getContext(),
}
/**
- * Process $wgExternalDiffEngine and get a sane, usable engine
+ * Process ExternalDiffEngine config and get a sane, usable engine
*
* @return bool|string 'wikidiff2', path to an executable, or false
* @internal For use by this class and TextSlotDiffRenderer only.
*/
public static function getEngine() {
- global $wgExternalDiffEngine;
- // We use the global here instead of Config because we write to the value,
- // and Config is not mutable.
- if ( $wgExternalDiffEngine == 'wikidiff' || $wgExternalDiffEngine == 'wikidiff3' ) {
- wfDeprecated( "\$wgExternalDiffEngine = '{$wgExternalDiffEngine}'", '1.27' );
- $wgExternalDiffEngine = false;
- } elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
- wfDeprecated( "\$wgExternalDiffEngine = '{$wgExternalDiffEngine}'", '1.32' );
- $wgExternalDiffEngine = false;
- } elseif ( !is_string( $wgExternalDiffEngine ) && $wgExternalDiffEngine !== false ) {
- // And prevent people from shooting themselves in the foot...
- wfWarn( '$wgExternalDiffEngine is set to a non-string value, forcing it to false' );
- $wgExternalDiffEngine = false;
- }
-
- if ( is_string( $wgExternalDiffEngine ) && is_executable( $wgExternalDiffEngine ) ) {
- return $wgExternalDiffEngine;
- } elseif ( $wgExternalDiffEngine === false && function_exists( 'wikidiff2_do_diff' ) ) {
+ $externalDiffEngine = MediaWikiServices::getInstance()->getMainConfig()
+ ->get( 'ExternalDiffEngine' );
+
+ if ( $externalDiffEngine ) {
+ if ( is_string( $externalDiffEngine ) ) {
+ if ( is_executable( $externalDiffEngine ) ) {
+ return $externalDiffEngine;
+ }
+ wfDebug( 'ExternalDiffEngine config points to a non-executable, ignoring' );
+ } else {
+ wfWarn( 'ExternalDiffEngine config is set to a non-string value, ignoring' );
+ }
+ }
+
+ if ( function_exists( 'wikidiff2_do_diff' ) ) {
return 'wikidiff2';
- } else {
- // Native PHP
- return false;
}
+
+ // Native PHP
+ return false;
}
/**
private function userCanEdit( Revision $rev ) {
$user = $this->getUser();
- if ( !$rev->getContentHandler()->supportsDirectEditing() ) {
- return false;
- }
-
if ( !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
return false;
}
* false signifies that there is no previous/next revision ($old is the oldest/newest one).
*/
public function mapDiffPrevNext( $old, $new ) {
+ $rl = MediaWikiServices::getInstance()->getRevisionLookup();
if ( $new === 'prev' ) {
// Show diff between revision $old and the previous one. Get previous one from DB.
$newid = intval( $old );
- $oldid = $this->getTitle()->getPreviousRevisionID( $newid );
+ $oldid = false;
+ $newRev = $rl->getRevisionById( $newid );
+ if ( $newRev ) {
+ $oldRev = $rl->getPreviousRevision( $newRev );
+ if ( $oldRev ) {
+ $oldid = $oldRev->getId();
+ }
+ }
} elseif ( $new === 'next' ) {
// Show diff between revision $old and the next one. Get next one from DB.
$oldid = intval( $old );
- $newid = $this->getTitle()->getNextRevisionID( $oldid );
+ $newid = false;
+ $oldRev = $rl->getRevisionById( $oldid );
+ if ( $oldRev ) {
+ $newRev = $rl->getNextRevision( $oldRev );
+ if ( $newRev ) {
+ $newid = $newRev->getId();
+ }
+ }
} else {
$oldid = intval( $old );
$newid = intval( $new );