SMW compat fix

Author: JeroenDeDauw

SemanticMaps.php

@@ -16,7 +16,7 @@
 	return 1;
 }
 
-define( 'SM_VERSION', '3.1.2' );
+define( 'SM_VERSION', '3.1.3' );
 
 if ( version_compare( $GLOBALS['wgVersion'], '1.19c', '<' ) ) {
 	throw new Exception( 'This version of Semantic Maps requires MediaWiki 1.18 or above;'

docs/RELEASE-NOTES.md

@@ -1,5 +1,11 @@
 These are the release notes for the Semantic Maps extension.
 
+## Semantic Maps 3.1.3
+
+Released on November 11th, 2014.
+
+* Restored compatibility with SMW 2.0.x (broken in SM 3.1.2)
+
 ## Semantic Maps 3.1.2
 
 Released on November 11th, 2014.

src/SM_AreaValueDescription.php

@@ -41,10 +41,6 @@ class SMAreaValueDescription extends SMWValueDescription {
 	protected $radius;
 
 	/**
-	 * Constructor.
-	 * 
-	 * @since 0.6
-	 * 
 	 * @param SMWDataItem $areaCenter
 	 * @param string $comparator
 	 * @param string $radius
@@ -65,16 +61,21 @@ public function __construct( SMWDataItem $areaCenter, $comparator, $radius, SMWD
 		$this->bounds = $this->getBoundingBox();
 	}
 
+	private function getPropertyCompat() {
+		return method_exists( $this, 'getProperty' ) ? $this->getProperty() : $this->m_property;
+	}
+
 	/**
 	 * @see SMWDescription:getQueryString
 	 * 
 	 * @since 0.6
 	 * 
-	 * @param Boolean $asValue
+	 * @param boolean $asValue
+	 * @return string
 	 */
 	public function getQueryString( $asValue = false ) {
 		if ( $this->getDataItem() !== null ) {
-			$queryString = DataValueFactory::newDataItemValue( $this->getDataItem(), $this->getProperty() )->getWikiValue();
+			$queryString = DataValueFactory::newDataItemValue( $this->getDataItem(), $this->getPropertyCompat() )->getWikiValue();
 			return $asValue ? $queryString : "[[$queryString]]";
 		} else {
 			return $asValue ? '+' : '';

src/SM_GeoCoordsValueDescription.php

@@ -18,15 +18,20 @@ class SMGeoCoordsValueDescription extends SMWValueDescription {
 	 * @since 0.6
 	 * 
 	 * @param boolean $asValue
+	 * @return string
 	 */
 	public function getQueryString( $asValue = false ) {
 		if ( $this->getDataItem() !== null ) {
-			$queryString = DataValueFactory::newDataItemValue( $this->getDataItem(), $this->getProperty() )->getWikiValue();
+			$queryString = DataValueFactory::newDataItemValue( $this->getDataItem(), $this->getPropertyCompat() )->getWikiValue();
 			return $asValue ? $queryString : "[[$queryString]]";
 		} else {
 			return $asValue ? '+' : '';
 		}
 	}
+
+	private function getPropertyCompat() {
+		return method_exists( $this, 'getProperty' ) ? $this->getProperty() : $this->m_property;
+	}
 
 	/**
 	 * @see SMWDescription::getSQLCondition