* @ingroup DifferenceEngine
*/
-/**
- * Constant to indicate diff cache compatibility.
- * Bump this when changing the diff formatting in a way that
- * fixes important bugs or such to force cached diff views to
- * clear.
- */
+// Deprecated, use class constant instead
define( 'MW_DIFF_VERSION', '1.11a' );
/**
* @ingroup DifferenceEngine
*/
class DifferenceEngine extends ContextSource {
+ /**
+ * Constant to indicate diff cache compatibility.
+ * Bump this when changing the diff formatting in a way that
+ * fixes important bugs or such to force cached diff views to
+ * clear.
+ */
+ const DIFF_VERSION = MW_DIFF_VERSION;
/** @var int */
public $mOldid;
// Build the link
if ( $rcid ) {
$this->getOutput()->preventClickjacking();
+ $this->getOutput()->addModuleStyles( 'mediawiki.page.patrol' );
if ( $wgEnableAPI && $wgEnableWriteAPI
&& $user->isAllowed( 'writeapi' )
) {
throw new MWException( 'mOldid and mNewid must be set to get diff cache key.' );
}
- return wfMemcKey( 'diff', 'version', MW_DIFF_VERSION,
+ return wfMemcKey( 'diff', 'version', self::DIFF_VERSION,
'oldid', $this->mOldid, 'newid', $this->mNewid );
}
return $this->generateTextDiffBody( $otext, $ntext );
}
- /**
- * Generate a diff, no caching
- *
- * @param string $otext Old text, must be already segmented
- * @param string $ntext New text, must be already segmented
- *
- * @return bool|string
- * @deprecated since 1.21, use generateContentDiffBody() instead!
- */
- public function generateDiffBody( $otext, $ntext ) {
- ContentHandler::deprecated( __METHOD__, "1.21" );
-
- return $this->generateTextDiffBody( $otext, $ntext );
- }
-
/**
* Generate a diff, no caching
*
} elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
// Same as above, but with no deprecation warnings
$wgExternalDiffEngine = false;
- } elseif ( !is_string( $wgExternalDiffEngine ) ) {
+ } 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;