Version 3.2.3

upload/admin/sources/classes/mapping/engines/google.php

@@ -3,20 +3,20 @@
 /**
  * <pre>
  * Invision Power Services
- * IP.Board v3.1.4
+ * IP.Board v3.2.3
  * Bing mapping class
  * Owner: Matt Mecham
- * Last Updated: $Date: 2010-08-03 17:20:16 +0100 (Tue, 03 Aug 2010) $
+ * Last Updated: $Date: 2011-05-05 07:03:47 -0400 (Thu, 05 May 2011) $
  *
  * @example
  *
- * @author 		$Author: matt $
+ * @author 		$Author: ips_terabyte $
  * @copyright	(c) 2001 - 2009 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/community/board/license.html
+ * @license		This is NULLED!
  * @package		IP.Board
- * @link		http://www.invisionpower.com
+ * @link		http://hatynka.in
  * @since		9th March 2005 11:03
- * @version		$Revision: 6725 $
+ * @version		$Revision: 8644 $
  */
 
 class classes_mapping_google extends classes_mapping_composite
@@ -68,6 +68,7 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $member;
+	protected $memberData;
 	
 	/**
 	 * Cache object
@@ -76,11 +77,12 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @var		object
 	 */	
 	protected $cache;
+	protected $caches;
 	
 	/**
 	 * Method constructor
 	 *
-	 * @return	void
+	 * @return	@e void
 	 */
 	public function __construct()
 	{
@@ -121,8 +123,8 @@ class classes_mapping_google extends classes_mapping_composite
 		}
 		
 		/* Lets do it. */
-		require_once( IPS_KERNEL_PATH . 'classFileManagement.php' );
-		$file = new classFileManagement();
+		$classToLoad = IPSLib::loadLibrary( IPS_KERNEL_PATH . 'classFileManagement.php', 'classFileManagement' );
+		$file = new $classToLoad();
 		
 		/* fetch */
 		$json = $file->getFileContents( "http://maps.googleapis.com/maps/api/geocode/json?latlng=" . $lat . ',' . $lon . '&sensor=false' );
@@ -225,7 +227,7 @@ class classes_mapping_google extends classes_mapping_composite
 	 * @param array $return
 	 * @return string
 	 */
-	private function _getShort( $return )
+	protected function _getShort( $return )
 	{
 		if ( $return['locality'] != $return['district2'] )
 		{