X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fdiff%2FDifferenceEngine.php;h=c138eec2e2e85005a05b5e3072eac29c2aac605a;hb=6382ba2d5a487def06bde3fa1749de2944535954;hp=2c63dfb525e79a234a742f4fe5be6c936e1450b0;hpb=3e7f211f621ae58aeb875f612617ab3a7ee82522;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 2c63dfb525..c138eec2e2 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -685,24 +685,20 @@ class DifferenceEngine extends ContextSource { $this->mCacheHit = true; // Check if the diff should be hidden from this user if ( !$this->loadRevisionData() ) { - return false; } elseif ( $this->mOldRev && !$this->mOldRev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) { - return false; } elseif ( $this->mNewRev && !$this->mNewRev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) { - return false; } // Short-circuit if ( $this->mOldRev === false || ( $this->mOldRev && $this->mNewRev && $this->mOldRev->getID() == $this->mNewRev->getID() ) ) { - return ''; } // Cacheable? @@ -714,7 +710,7 @@ class DifferenceEngine extends ContextSource { if ( !$this->mRefreshCache ) { $difftext = $wgMemc->get( $key ); if ( $difftext ) { - wfIncrStats( 'diff_cache_hit' ); + wfIncrStats( 'diff_cache.hit' ); $difftext = $this->localiseLineNumbers( $difftext ); $difftext .= "\n\n"; @@ -726,7 +722,6 @@ class DifferenceEngine extends ContextSource { // Loadtext is permission safe, this just clears out the diff if ( !$this->loadText() ) { - return false; } @@ -734,12 +729,12 @@ class DifferenceEngine extends ContextSource { // Save to cache for 7 days if ( !Hooks::run( 'AbortDiffCache', array( &$this ) ) ) { - wfIncrStats( 'diff_uncacheable' ); + wfIncrStats( 'diff_cache.uncacheable' ); } elseif ( $key !== false && $difftext !== false ) { - wfIncrStats( 'diff_cache_miss' ); + wfIncrStats( 'diff_cache.miss' ); $wgMemc->set( $key, $difftext, 7 * 86400 ); } else { - wfIncrStats( 'diff_uncacheable' ); + wfIncrStats( 'diff_cache.uncacheable' ); } // Replace line numbers with the text in the user's language if ( $difftext !== false ) { @@ -859,12 +854,10 @@ class DifferenceEngine extends ContextSource { $tempFile1 = fopen( $tempName1, "w" ); if ( !$tempFile1 ) { - return false; } $tempFile2 = fopen( $tempName2, "w" ); if ( !$tempFile2 ) { - return false; } fwrite( $tempFile1, $otext ); @@ -1040,7 +1033,7 @@ class DifferenceEngine extends ContextSource { $key = $title->quickUserCan( 'edit', $user ) ? 'editold' : 'viewsourceold'; $msg = $this->msg( $key )->escaped(); $editLink = $this->msg( 'parentheses' )->rawParams( - Linker::linkKnown( $title, $msg, array( ), $editQuery ) )->escaped(); + Linker::linkKnown( $title, $msg, array(), $editQuery ) )->escaped(); $header .= ' ' . Html::rawElement( 'span', array( 'class' => 'mw-diff-edit' ),