| Index: trunk/extensions/Maps/includes/manipulations/Maps_ParamGeoService.php |
| — | — | @@ -28,7 +28,6 @@ |
| 29 | 29 | */ |
| 30 | 30 | public function __construct( $mappingServiceParam = false ) { |
| 31 | 31 | parent::__construct(); |
| 32 | | - |
| 33 | 32 | $this->mappingServiceParam = $mappingServiceParam; |
| 34 | 33 | } |
| 35 | 34 | |
| — | — | @@ -49,7 +48,9 @@ |
| 50 | 49 | $value = $this->getMainIndentifier( $value ); |
| 51 | 50 | |
| 52 | 51 | // Override the defaulting. |
| 53 | | - if ( $parameter->wasSetToDefault() && $this->mappingServiceParam !== false ) { |
| | 52 | + if ( $parameter->wasSetToDefault() |
| | 53 | + && is_string( $this->mappingServiceParam ) |
| | 54 | + && array_key_exists( $this->mappingServiceParam, $parameters ) ) { |
| 54 | 55 | $value = self::resolveOverrides( $value, $parameters[$this->mappingServiceParam]->getValue() ); |
| 55 | 56 | } |
| 56 | 57 | |