http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89988
Revision: 89988
Author: jeroendedauw
Date: 2011-06-13 18:18:27 +0000 (Mon, 13 Jun 2011)
Log Message:
-----------
fixed compat issue
Modified Paths:
--------------
trunk/extensions/SemanticResultFormats/Math/SRF_Math.php
Modified: trunk/extensions/SemanticResultFormats/Math/SRF_Math.php
===================================================================
--- trunk/extensions/SemanticResultFormats/Math/SRF_Math.php 2011-06-13
18:15:49 UTC (rev 89987)
+++ trunk/extensions/SemanticResultFormats/Math/SRF_Math.php 2011-06-13
18:18:27 UTC (rev 89988)
@@ -29,17 +29,17 @@
$max = '';
while ( $row = $res->getNext() ) {
- $last_col = array_pop( $row );
+ /* SMWResultArray */ $last_col = array_pop( $row );
- foreach ( $last_col->getContent() as $value ) {
+ while ( ( $value = efSRFGetNextDV( $last_col ) ) !==
false ) {
// handle each value only if it's of type
Number or NAry
if ( $value instanceof SMWNumberValue ) {
- if ( method_exists( $value,
'getValueKey' ) ) {
+ // getDataItem was introduced in SMW
1.6, getValueKey was deprecated in the same version.
+ if ( method_exists( $value,
'getDataItem' ) ) {
+ $num =
$value->getDataItem()->getNumber();
+ } else {
$num = $value->getValueKey();
}
- else {
- $num =
$value->getNumericValue();
- }
} elseif ( $value instanceof SMWNAryValue ) {
$inner_values = $value->getDVs();
// find the first inner value that's of
@@ -49,12 +49,12 @@
foreach ( $inner_values as $inner_value
) {
if ( $inner_value instanceof
SMWNumberValue ) {
- if ( method_exists(
$inner_value, 'getValueKey' ) ) {
+ // getDataItem was
introduced in SMW 1.6, getValueKey was deprecated in the same version.
+ if ( method_exists(
$inner_value, 'getDataItem' ) ) {
+ $num =
$inner_value->getDataItem()->getNumber();
+ } else {
$num =
$inner_value->getValueKey();
}
- else {
- $num =
$inner_value->getNumericValue();
- }
break;
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
