Merge "Add checkDependencies.php"

[lhc/web/wiklou.git] / includes / diff / DifferenceEngine.php

diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php
index e39334f..f7658fc 100644 (file)
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -250,7 +250,7 @@ class DifferenceEngine extends ContextSource {
 
                        $slotContents = $this->getSlotContents();
                        $this->slotDiffRenderers = array_map( function ( $contents ) {
-                               /** @var $content Content */
+                               /** @var Content $content */
                                $content = $contents['new'] ?: $contents['old'];
                                return $content->getContentHandler()->getSlotDiffRenderer( $this->getContext() );
                        }, $slotContents );
@@ -1172,7 +1172,6 @@ class DifferenceEngine extends ContextSource {
 
                if ( $engine === 'wikidiff2' ) {
                        $params[] = phpversion( 'wikidiff2' );
-                       $params[] = $this->getConfig()->get( 'WikiDiff2MovedParagraphDetectionCutoff' );
                }
 
                if ( !$this->isSlotDiffRenderer ) {
@@ -1733,16 +1732,16 @@ class DifferenceEngine extends ContextSource {
         * by the request context); if oldid is 0, then compare the revision in newid to the
         * immediately previous one.
         *
-        * If oldid is false, leave the corresponding revision object set
-        * to false. This can happen with 'diff=prev' pointing to a non-existent revision,
-        * and is also used directly by the API.
+        * If oldid is false, leave the corresponding revision object set to false. This can
+        * happen with 'diff=prev' pointing to a non-existent revision, and is also used directly
+        * by the API.
         *
         * @return bool Whether both revisions were loaded successfully. Setting mOldRev
         *   to false counts as successful loading.
         */
        public function loadRevisionData() {
                if ( $this->mRevisionsLoaded ) {
-                       return $this->isContentOverridden || $this->mNewRev && !is_null( $this->mOldRev );
+                       return $this->isContentOverridden || ( $this->mOldRev !== null && $this->mNewRev !== null );
                }
 
                // Whether it succeeds or fails, we don't want to try again