From fddd16fcfd882ec3de27b2b60a5ae6fb1b4fc461 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Tue, 22 Dec 2009 13:53:01 -0500 Subject: [PATCH] Put the various map provider api keys into HordeMap.conf --- kronolith/lib/Kronolith.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kronolith/lib/Kronolith.php b/kronolith/lib/Kronolith.php index 3a4b5ebe6..c741e0ba9 100644 --- a/kronolith/lib/Kronolith.php +++ b/kronolith/lib/Kronolith.php @@ -131,13 +131,13 @@ class Kronolith foreach ($params['providers'] as $layer) { switch ($layer) { case 'Google': - $params['apikeys']['google'] = $GLOBALS['conf']['api']['googlemaps']; + $params['conf']['apikeys']['google'] = $GLOBALS['conf']['api']['googlemaps']; break; case 'Yahoo': - $params['apikeys']['yahoo'] = $GLOBALS['conf']['api']['yahoomaps']; + $params['conf']['apikeys']['yahoo'] = $GLOBALS['conf']['api']['yahoomaps']; break; case 'Cloudmade': - $params['apikeys']['cloudemade'] = $GLOBALS['conf']['api']['cloudemade']; + $params['conf']['apikeys']['cloudmade'] = $GLOBALS['conf']['api']['cloudmade']; break; } } @@ -146,13 +146,13 @@ class Kronolith if (!empty($params['geocoder'])) { switch ($params['geocoder']) { case 'Google': - $params['apikeys']['google'] = $GLOBALS['conf']['api']['googlemaps']; + $params['conf']['apikeys']['google'] = $GLOBALS['conf']['api']['googlemaps']; break; case 'Yahoo': - $params['apikeys']['yahoo'] = $GLOBALS['conf']['api']['yahoomaps']; + $params['conf']['apikeys']['yahoo'] = $GLOBALS['conf']['api']['yahoomaps']; break; case 'Cloudmade': - $params['apikeys']['cloudemade'] = $GLOBALS['conf']['api']['cloudemade']; + $params['conf']['apikeys']['cloudmade'] = $GLOBALS['conf']['api']['cloudmade']; break; } } -- 2.11.0