jenkins-bot has submitted this change and it was merged. Change subject: Core::parseWikiText - Removed $nocache parameter ......................................................................
Core::parseWikiText - Removed $nocache parameter Disabled the $nocache parameter as it breaks the code when set to true. It seems this is some legacy code from very early MW versions. Needs merge to REL1_23. Fixed because of exception: includes\parser\Parser.php: Parser::disableCache can only be called when actually parsing something Backtrace: #0 extensions\BlueSpiceFoundation\includes\Core.class.php(384):Parser->disableCache() #1 extensions\BlueSpiceExtensions\WatchList\WatchList.class.php(217): BsCore->parseWikiText(string, Title, boolean) Change-Id: Ifd177b48463cb8323951cafb49ba431ee8dfeae2 --- M includes/Core.class.php 1 file changed, 11 insertions(+), 3 deletions(-) Approvals: Robert Vogel: Looks good to me, approved Tweichart: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/includes/Core.class.php b/includes/Core.class.php index c655d78..afc625b 100644 --- a/includes/Core.class.php +++ b/includes/Core.class.php @@ -365,8 +365,14 @@ return BSROOTDIR; } - // todo msc 2011-04-27 wiederholter Aufruf führt schnell zu einem Speicherüberlauf (>128MB bei Indexierung) - // scheinbar wird ausserhalb der Methode gecacht! Aufruf mit adapter->parseWikiText($text, true) schafft KEINE Abhilfe. + /** + * Parses WikiText into HTML + * @param string $sText WikiText + * @param Title $oTitle + * @param bool $nocache DISFUNCTIONAL and therefore DEPRECATED. There is no chaching anyway. + * @param bool $numberheadings + * @return string The HTML result + */ public function parseWikiText( $sText, $oTitle, $nocache = false, $numberheadings = null ) { wfProfileIn('BS::' . __METHOD__); @@ -381,7 +387,9 @@ // TODO MRG20110707: Check it this cannot be unified - if ( $nocache ) self::$oLocalParser->disableCache(); + if ( $nocache ) { + wfDebug( __METHOD__.': Use of $nocache parameter is deprecated. There is no caching anyway.' ); + } if ( !( $oTitle instanceof Title ) ) return ''; -- To view, visit https://gerrit.wikimedia.org/r/246202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifd177b48463cb8323951cafb49ba431ee8dfeae2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz> Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz> Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz> Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz> Gerrit-Reviewer: Tweichart <weich...@hallowelt.biz> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits