From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 16 Sep 2017 20:07:56 +0000 (+0000)
Subject: Merge "Fix return in Preprocessor::cacheSetTree"
X-Git-Tag: 1.31.0-rc.0~2079
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_del%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=0be80f9680ae5acba1931f18fdecd0e3c634d6a6;hp=-c;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix return in Preprocessor::cacheSetTree"
---

0be80f9680ae5acba1931f18fdecd0e3c634d6a6
diff --combined includes/parser/Preprocessor.php
index 627d112021,03726ca8e5..49e961aec3
--- a/includes/parser/Preprocessor.php
+++ b/includes/parser/Preprocessor.php
@@@ -62,7 -62,6 +62,7 @@@ abstract class Preprocessor 
  	 *
  	 * @param string $text
  	 * @param int $flags
 +	 * @param string $tree
  	 */
  	protected function cacheSetTree( $text, $flags, $tree ) {
  		$config = RequestContext::getMain()->getConfig();
@@@ -70,7 -69,7 +70,7 @@@
  		$length = strlen( $text );
  		$threshold = $config->get( 'PreprocessorCacheThreshold' );
  		if ( $threshold === false || $length < $threshold || $length > 1e6 ) {
- 			return false;
+ 			return;
  		}
  
  		$cache = ObjectCache::getLocalClusterInstance();