http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89985
Revision: 89985
Author: jeroendedauw
Date: 2011-06-13 18:07:24 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
compat fix
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
Modified: trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
===================================================================
--- trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-06-13 18:02:14 UTC (rev 89984)
+++ trunk/extensions/SemanticResultFormats/jqPlot/SRF_jqPlotPie.php
2011-06-13 18:07:24 UTC (rev 89985)
@@ -119,21 +119,27 @@
while ( $row = $res->getNext() ) {
$name = efSRFGetNextDV( $row[0] )->getShortWikiText();
$name = str_replace( "'", "\'", $name );
+
foreach ( $row as $field ) {
while ( ( $object = efSRFGetNextDV( $field ) )
!== false ) {
if ( $object->isNumeric() ) { // use
numeric sortkey
- if ( method_exists( $object,
'getValueKey' ) ) {
+
+ // getDataItem was introduced
in SMW 1.6, getValueKey was deprecated in the same version.
+ if ( method_exists( $object,
'getDataItem' ) ) {
+ $nr =
$object->getDataItem()->getSortKey();
+ } else {
$nr =
$object->getValueKey();
- } else {
- $nr =
$object->getNumericValue();
}
+
$pie_data[] .= "['$name', $nr]";
}
}
}
}
+
$pie_data_str = "[[" . implode( ', ', $pie_data ) . "]]";
$pieID = 'pie' . self::$m_piechartnum;
+
self::$m_piechartnum++;
$js_pie =<<<END
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
