jenkins-bot has submitted this change and it was merged.
Change subject: Use Parser::OT_HTML class const
......................................................................
Use Parser::OT_HTML class const
Instead of the global const
Change-Id: I2d6c98e56e990f6aba2bab0e93e3ff7c5175c177
---
M WYSIWYG/CKeditorEditPage.body.php
M WYSIWYG/CKeditorParser.body.php
M WYSIWYG/CKeditorSajax.body.php
M WYSIWYG/tests/testcases/TestWYSIWYGparser.php
4 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WYSIWYG/CKeditorEditPage.body.php
b/WYSIWYG/CKeditorEditPage.body.php
index e4bc5fa..418729d 100644
--- a/WYSIWYG/CKeditorEditPage.body.php
+++ b/WYSIWYG/CKeditorEditPage.body.php
@@ -50,7 +50,7 @@
$options = new CKeditorParserOptions();
$options->setTidy( true );
$parser = new CKeditorParser();
- $parser->setOutputType( OT_HTML );
+ $parser->setOutputType( Parser::OT_HTML );
$pa = $parser->parse( $t, $this->mTitle, $options );
return $pa->mText;
}
diff --git a/WYSIWYG/CKeditorParser.body.php b/WYSIWYG/CKeditorParser.body.php
index 5a4310c..0924d4c 100644
--- a/WYSIWYG/CKeditorParser.body.php
+++ b/WYSIWYG/CKeditorParser.body.php
@@ -287,7 +287,7 @@
global $wgContLang, $wgUseTeX, $wgScriptPath, $wgVersion, $wgHooks,
$wgExtensionFunctions;
wfProfileIn(__METHOD__);
- $render = ( $this->mOutputType == OT_HTML );
+ $render = ( $this->mOutputType == Parser::OT_HTML );
$uniq_prefix = $this->mUniqPrefix;
$commentState = new ReplacementArray;
diff --git a/WYSIWYG/CKeditorSajax.body.php b/WYSIWYG/CKeditorSajax.body.php
index d715522..00c0d95 100644
--- a/WYSIWYG/CKeditorSajax.body.php
+++ b/WYSIWYG/CKeditorSajax.body.php
@@ -27,7 +27,7 @@
$parser->setHook( 'ref', array( $parser, 'ref' ) );
$parser->setHook( 'references', array( $parser, 'references' )
);
}
- $parser->setOutputType( OT_HTML );
+ $parser->setOutputType( Parser::OT_HTML );
$originalLink = $parser->parse( '[[File:' . $term . ']]', $wgTitle,
$options )->getText();
if( false == strpos( $originalLink, 'src="' ) ) {
return '';
@@ -285,7 +285,7 @@
$options = new CKeditorParserOptions();
$options->setTidy( true );
$parser = new CKeditorParser();
- $parser->setOutputType( OT_HTML );
+ $parser->setOutputType( Parser::OT_HTML );
// wfSajaxToggleCKeditor( 'show' ); // FCKeditor was switched to visible
$resultText = $parser->parse( $wiki, $wgTitle, $options )->getText();
diff --git a/WYSIWYG/tests/testcases/TestWYSIWYGparser.php
b/WYSIWYG/tests/testcases/TestWYSIWYGparser.php
index 03d5187..4460cf5 100644
--- a/WYSIWYG/tests/testcases/TestWYSIWYGparser.php
+++ b/WYSIWYG/tests/testcases/TestWYSIWYGparser.php
@@ -56,7 +56,7 @@
$this->options = new CKeditorParserOptions();
$this->options->setTidy(true);
$this->parser = new CKeditorParser();
- $this->parser->setOutputType(OT_HTML);
+ $this->parser->setOutputType(Parser::OT_HTML);
global $wgTitle;
$wgTitle = $this->title;
}
--
To view, visit https://gerrit.wikimedia.org/r/174158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d6c98e56e990f6aba2bab0e93e3ff7c5175c177
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WYSIWYG
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
