http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89167
Revision: 89167
Author: jeroendedauw
Date: 2011-05-30 13:53:41 +0000 (Mon, 30 May 2011)
Log Message:
-----------
fixed output that was getting messed up by the mw parser
Modified Paths:
--------------
trunk/extensions/Spark/Spark.class.php
trunk/extensions/Spark/Spark.hooks.php
Modified: trunk/extensions/Spark/Spark.class.php
===================================================================
--- trunk/extensions/Spark/Spark.class.php 2011-05-30 13:49:09 UTC (rev
89166)
+++ trunk/extensions/Spark/Spark.class.php 2011-05-30 13:53:41 UTC (rev
89167)
@@ -41,17 +41,21 @@
*
* @since 0.1
*
+ * @param Parser $parser
+ *
* @return string
*/
- public function render() {
+ public function render( Parser $parser ) {
if ( array_key_exists( 'data-spark-query', $this->parameters )
) {
$query = htmlspecialchars(
$this->parameters['data-spark-query'] );
$query = str_replace( array( '<', '>' ), array(
'<', '>' ), $query );
unset( $this->parameters['data-spark-query'] );
- return '<div class="spark" data-spark-query="' . $query
. '" ' . Html::expandAttributes( $this->parameters ) . ' >' .
+ $html = '<div class="spark" data-spark-query="' .
$query . '" ' . Html::expandAttributes( $this->parameters ) . ' >' .
( is_null( $this->contents ) ?
'' : htmlspecialchars( $this->contents ) ) .
- '</div>';
+ '</div>';
+
+ return array( $parser->insertStripItem( $html,
$parser->mStripState ), 'noparse' => true, 'isHTML' => true );
}
else {
return Html::element( 'i', array(), wfMsg(
'spark-missing-query' ) );
Modified: trunk/extensions/Spark/Spark.hooks.php
===================================================================
--- trunk/extensions/Spark/Spark.hooks.php 2011-05-30 13:49:09 UTC (rev
89166)
+++ trunk/extensions/Spark/Spark.hooks.php 2011-05-30 13:53:41 UTC (rev
89167)
@@ -44,7 +44,7 @@
}
$tag = new SparkTag( $args, $input );
- return $tag->render();
+ return $tag->render( $parser );
}
}
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
