Jackmcbarn has uploaded a new change for review. https://gerrit.wikimedia.org/r/164788
Change subject: Remove loadedLibraries ...................................................................... Remove loadedLibraries Nothing actually uses this, so I'm not sure why we ever kept track of it. Change-Id: I60480b96a83731c7b25aed55099886a86efc08b1 --- M engines/LuaCommon/LuaCommon.php 1 file changed, 1 insertion(+), 14 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Scribunto refs/changes/88/164788/2 diff --git a/engines/LuaCommon/LuaCommon.php b/engines/LuaCommon/LuaCommon.php index a9d6aee..2368385 100644 --- a/engines/LuaCommon/LuaCommon.php +++ b/engines/LuaCommon/LuaCommon.php @@ -38,7 +38,6 @@ protected $currentFrames = array(); protected $expandCache = array(); protected $availableLibraries = array(); - protected $loadedLibraries = array(); const MAX_EXPAND_CACHE_SIZE = 100; @@ -71,7 +70,6 @@ $this->interpreter = null; $this->mw = null; $this->expandCache = null; - $this->loadedLibraries = null; parent::destroy(); } @@ -431,18 +429,7 @@ throw new MWException( "No class for library \"$name\"" ); } } - $this->loadedLibraries[$name] = $class; - $ret = $this->loadedLibraries[$name]->register(); - - // @todo $this->loadedLibraries[$name] should always be unset when $ret - // is null, but we can't do that in the non-deferred case yet, since we - // need to maintain BC with extensions that don't yet return the output - // of registerInterface. - if ( $ret === null && $loadDeferred ) { - unset( $this->loadedLibraries[$name] ); - } - - return $ret; + return $class->register(); } /** -- To view, visit https://gerrit.wikimedia.org/r/164788 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I60480b96a83731c7b25aed55099886a86efc08b1 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Scribunto Gerrit-Branch: master Gerrit-Owner: Jackmcbarn <jackmcb...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits