wikimedia/mediawiki-extensions-Scribunto
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Scribunto synced 2024-11-24 00:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't attempt to parse non-Modules in the console

Browse source 
When processing Lua console requests, don't attempt to parse pages that
aren't modules. This allows the Lua console to be successfully loaded
everywhere.

Change-Id: Idfd1985aca4acb6a8f3235d34ac00358e30e361c
This commit is contained in:
Jackmcbarn 2014-04-07 17:58:31 -04:00 committed by Tim Starling
parent 15203e9b72
commit 819320ec3b
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
engines/LuaCommon/LuaCommon.php
View file

@ -331,8 +331,9 @@ abstract class Scribunto_LuaEngine extends ScribuntoEngineBase {
* apparently that's what lua.c does.
*/
$code = "return function (__init, exe)\n" .
"local _, p = exe(__init)\n" .
"_, __init, exe = nil, nil, nil\n" .
"if not exe then exe = function(...) return true, ... end end\n" .
"local p = select(2, exe(__init) )\n" .
"__init, exe = nil, nil\n" .
"local print = mw.log\n";
foreach ( $params['prevQuestions'] as $q ) {
if ( substr( $q, 0, 1 ) === '=' ) {
@ -353,9 +354,15 @@ abstract class Scribunto_LuaEngine extends ScribuntoEngineBase {
}
$code .= "end\n";
$contentModule = $this->newModule(
$params['content'], $params['title']->getPrefixedDBkey() );
$contentInit = $contentModule->getInitChunk();
if ( $params['title']->hasContentModel( 'Scribunto' ) ) {
$contentModule = $this->newModule(
$params['content'], $params['title']->getPrefixedDBkey() );
$contentInit = $contentModule->getInitChunk();
$contentExe = $this->mw['executeModule'];
} else {
$contentInit = $params['content'];
$contentExe = null;
}
$consoleModule = $this->newModule(
$code,
@ -364,7 +371,7 @@ abstract class Scribunto_LuaEngine extends ScribuntoEngineBase {
$consoleInit = $consoleModule->getInitChunk();
$ret = $this->getInterpreter()->callFunction( $this->mw['executeModule'], $consoleInit, false );
$func = $ret[1];
$ret = $this->getInterpreter()->callFunction( $func, $contentInit, $this->mw['executeModule'] );
$ret = $this->getInterpreter()->callFunction( $func, $contentInit, $contentExe );
return array(
'return' => isset( $ret[0] ) ? $ret[0] : null,