From: Brion Vibber <brion@pobox.com>
Date: Wed, 15 Dec 2010 19:59:31 +0000 (-0800)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bf20258f4b61dd8396db9a1980463c060dab292c;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x
---

bf20258f4b61dd8396db9a1980463c060dab292c
diff --cc plugins/Mapstraction/MapstractionPlugin.php
index d1a7bd0edf,020c0818ad..d5b4e5052b
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@@ -125,11 -125,11 +125,11 @@@ class MapstractionPlugin extends Plugi
                                      urlencode($this->apikey)));
              break;
          case 'microsoft':
 -            $action->script('http://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
 +            $action->script((StatusNet::isHTTPS()?'https':'http') + '://dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6');
              break;
          case 'openlayers':
-             // XXX: is this not nice...?
-             $action->script('http://openlayers.org/api/OpenLayers.js');
+             // Use our included stripped & minified OpenLayers.
+             $action->script(common_path('plugins/Mapstraction/OpenLayers/OpenLayers.js'));
              break;
          case 'yahoo':
              $action->script(sprintf('http://api.maps.yahoo.com/ajaxymap?v=3.8&appid=%s',