subdivisions

Author: Benjamin Pick

shortcode.php

@@ -87,14 +87,9 @@ function geoip_detect2_shortcode($attr)
 	try {
 		if (count($properties) == 1) {
 			$return = $userInfo->{$properties[0]};
-		} else if (count($properties) == 2) {
-			$return = $userInfo->{$properties[0]};
-			if (!is_object($return))
-				throw new \RuntimeException('Invalid property name.');
-			$return = $return->{$properties[1]};
 		} else if ($properties[0] == 'subdivisions' && (count($properties) == 2 || count($properties) == 3)) {
 			$return = $userInfo->{$properties[0]};
-			if (!is_object($return))
+			if (!is_array($return))
 				throw new \RuntimeException('Invalid property name.');
 			if (!is_numeric($properties[1]))
 				throw new \RuntimeException('Invalid property name (must be numeric, e.g. "subdivisions.0").');
@@ -105,6 +100,11 @@ function geoip_detect2_shortcode($attr)
 					throw new \RuntimeException('Invalid property name.');
 				$return = $return->{$properties[2]};
 			}
+		} else if (count($properties) == 2) {
+			$return = $userInfo->{$properties[0]};
+			if (!is_object($return))
+			throw new \RuntimeException('Invalid property name.');
+			$return = $return->{$properties[1]};
 		} else {
 			throw new \RuntimeException('Only 1 dot supported. Please send a bug report to show me the shortcode you used if you need it ...');
 		}

tests/test-shortcode.php

@@ -40,7 +40,9 @@ function testShortcodeProperties() {
 	}
 	function testSubdivisionProperties() {
 		$this->assertEquals('HE', do_shortcode('[geoip_detect2 property="subdivisions.0.isoCode"]'));
-		$this->assertEquals('Hesse', do_shortcode('[geoip_detect2 property="subdivisions.0"]'));		
+		$this->assertEquals('Hesse', do_shortcode('[geoip_detect2 property="subdivisions.0"]'));
+		$this->assertContains('<!--',do_shortcode('[geoip_detect2 property="subdivisions.1"]'));
+		$this->assertContains('<!--',do_shortcode('[geoip_detect2 property="subdivisions.wrong"]'));
 	}
 	function testNonStringProperties() {
 		$this->assertEquals('2929134', do_shortcode('[geoip_detect2 property="city.geonameId"]'));