jenkins-bot has submitted this change and it was merged.
Change subject: fix transit values: Parser, PPFrame (v 2.3.0)
......................................................................
fix transit values: Parser, PPFrame (v 2.3.0)
Change-Id: Ie54583d1b4ee5b3f74a130cd2ac6eb2e6edf38cc
---
M PhpTags.body.php
M PhpTags.php
2 files changed, 10 insertions(+), 16 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PhpTags.body.php b/PhpTags.body.php
index b699ac3..0190739 100644
--- a/PhpTags.body.php
+++ b/PhpTags.body.php
@@ -39,6 +39,9 @@
self::$needInitRuntime = false;
}
+ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PARSER] = $parser;
+ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PPFRAME] = $frame;
+
$command = array_shift($args);
if ( count( $args ) > 0 ) {
foreach ( $args as &$value ) {
@@ -60,9 +63,8 @@
$result = \PhpTags\Runtime::run(
$bytecode,
array_merge( (array)$titleText,
$frame->getArguments() ),
- self::getScope( $frame ),
- array(
PHPTAGS_TRANSIT_PARSER=>&$parser, PHPTAGS_TRANSIT_PPFRAME=>&$frame )
- );
+ self::getScope( $frame )
+ );
$return = implode( $result );
} catch (\PhpTags\PhpTagsException $exc) {
$return = (string) $exc;
@@ -93,7 +95,8 @@
self::$needInitRuntime = false;
}
- $is_debug = isset($args['debug']);
+ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PARSER] = $parser;
+ \PhpTags\Runtime::$transit[PHPTAGS_TRANSIT_PPFRAME] = $frame;
$return = false;
try {
@@ -107,9 +110,8 @@
$result = \PhpTags\Runtime::run(
$bytecode,
array_merge( (array)$titleText,
$frame->getArguments() ),
- self::getScope( $frame ),
- array(
PHPTAGS_TRANSIT_PARSER=>&$parser, PHPTAGS_TRANSIT_PPFRAME=>&$frame )
- );
+ self::getScope( $frame )
+ );
} catch ( \PhpTags\PhpTagsException $exc ) {
// $wgPhpTagsTime += microtime(true) - $time;
$wgPhpTagsTime +=
$parser->mOutput->getTimeSinceStart('cpu') - $time;
@@ -122,14 +124,6 @@
// $wgPhpTagsTime += microtime(true) - $time;
$wgPhpTagsTime += $parser->mOutput->getTimeSinceStart('cpu') -
$time;
-
- if( $is_debug ) {
- $parser->getOutput()->addModules('ext.php.Debug');
- if( self::$DebugLoops ) {
-
$parser->getOutput()->addModules('ext.php.DebugLoops');
- }
- $return .= self::insertNoWiki( $parser,
array_shift($result) ) . "\n";
- }
if( count($result) > 0 ) {
//$return .=
Sanitizer::removeHTMLtags(implode($result));
diff --git a/PhpTags.php b/PhpTags.php
index fd4ee33..761b8c1 100644
--- a/PhpTags.php
+++ b/PhpTags.php
@@ -16,7 +16,7 @@
}
define( 'PHPTAGS_MAJOR_VERSION', 2 );
-define( 'PHPTAGS_MINOR_VERSION', 2 );
+define( 'PHPTAGS_MINOR_VERSION', 3 );
define( 'PHPTAGS_RELEASE_VERSION', 0 );
define( 'PHPTAGS_VERSION', PHPTAGS_MAJOR_VERSION . '.' . PHPTAGS_MINOR_VERSION
. '.' . PHPTAGS_RELEASE_VERSION );
--
To view, visit https://gerrit.wikimedia.org/r/145243
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie54583d1b4ee5b3f74a130cd2ac6eb2e6edf38cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PhpTags
Gerrit-Branch: master
Gerrit-Owner: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: Pastakhov <pastak...@yandex.ru>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
