http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89053
Revision: 89053
Author: jeroendedauw
Date: 2011-05-28 18:30:44 +0000 (Sat, 28 May 2011)
Log Message:
-----------
follow up to r89050
Modified Paths:
--------------
trunk/extensions/Spark/Spark.class.php
trunk/extensions/Spark/Spark.i18n.php
Modified: trunk/extensions/Spark/Spark.class.php
===================================================================
--- trunk/extensions/Spark/Spark.class.php 2011-05-28 18:05:45 UTC (rev
89052)
+++ trunk/extensions/Spark/Spark.class.php 2011-05-28 18:30:44 UTC (rev
89053)
@@ -44,11 +44,18 @@
* @return string
*/
public function render() {
- return Html::element(
- 'div',
- array_merge( array( 'class' => 'spark' ),
$this->parameters ),
- $this->contents
- );
+ 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 '<nowiki><div class="spark" data-spark-query="'
. $query . '" ' . Html::expandAttributes( $this->parameters ) . ' >' .
+ ( is_null( $this->contents ) ?
'' : htmlspecialchars( $this->contents ) ) .
+ '</div></nowiki>';
+ }
+ else {
+ return Html::element( 'i', array(), wfMsg(
'spark-missing-query' ) );
+ }
}
/**
Modified: trunk/extensions/Spark/Spark.i18n.php
===================================================================
--- trunk/extensions/Spark/Spark.i18n.php 2011-05-28 18:05:45 UTC (rev
89052)
+++ trunk/extensions/Spark/Spark.i18n.php 2011-05-28 18:30:44 UTC (rev
89053)
@@ -19,6 +19,7 @@
*/
$messages['en'] = array(
'spark-desc' => 'Adds a <code><nowiki><spark /></nowiki></code> tag
that enables embedding [http://km.aifb.kit.edu/sites/spark/ Spark] mash-ups.',
+ 'spark-missing-query' => 'You need to specify a query using the
"data-spark-query" parameter.',
);
/** Message documentation (Message documentation)
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
