Merge pull request #300 from JeroenDeDauw/php7-compat-split-line

Improved PHP 7 compatibility
ProfessionalWiki · Jan 8, 2017 · 3f79153 · 3f79153
2 parents 294899c + b4d0d73
commit 3f79153
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/includes/Geocoders.php b/includes/Geocoders.php
@@ -297,7 +297,8 @@ private static function getGeocoderInstance( $geocoderIdentifier ) {
 		if ( !array_key_exists( $geocoderIdentifier, self::$geocoders ) ) {
 			if ( array_key_exists( $geocoderIdentifier, self::$registeredGeocoders ) ) {
 				if ( is_string( self::$registeredGeocoders[$geocoderIdentifier] ) ) {
-					$geocoder = new self::$registeredGeocoders[$geocoderIdentifier]( $geocoderIdentifier );
+					$geocoderClass = self::$registeredGeocoders[$geocoderIdentifier];
+					$geocoder = new $geocoderClass( $geocoderIdentifier );
 				}
 				elseif ( self::$registeredGeocoders[$geocoderIdentifier] instanceof \Maps\Geocoders\Geocoder ) {
 					$geocoder = new MapsOldGeocoderAdapter(