From 46c5a5281086106370bde6405d48c200c8eb299b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 20 Nov 2009 10:08:13 -0800
Subject: fix notice bug

---
 plugins/Mapstraction/MapstractionPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/Mapstraction')

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index eabd0d0f0..d31106864 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -58,12 +58,12 @@ class MapstractionPlugin extends Plugin
      *
      * The way to register new actions from a plugin.
      *
-     * @param Router &$m reference to router
+     * @param Router $m reference to router
      *
      * @return boolean event handler return
      */
 
-    function onRouterInitialized(&$m)
+    function onRouterInitialized($m)
     {
         $m->connect(':nickname/all/map',
                     array('action' => 'allmap'),
-- 
cgit v1.2.3-54-g00ecf


From 1ca022464a87258357ab172bbdf4e91cce849091 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 20 Nov 2009 10:17:14 -0800
Subject: Fix double-escaped HTML in mapstraction notice popups

---
 plugins/Mapstraction/MapstractionPlugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/Mapstraction')

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index d31106864..daedaf40d 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -226,8 +226,8 @@ class MapstractionPlugin extends Plugin
 
         $arr = $act->twitterStatusArray($notice, true);
         $arr['url'] = $notice->bestUrl();
-        $arr['html'] = htmlspecialchars($notice->rendered);
-        $arr['source'] = htmlspecialchars($arr['source']);
+        $arr['html'] = $notice->rendered;
+        $arr['source'] = $arr['source'];
 
         if (!empty($notice->reply_to)) {
             $reply_to = Notice::staticGet('id', $notice->reply_to);
-- 
cgit v1.2.3-54-g00ecf


From afe5e71c4eae342d4a7c6a462a63a4f475ba355e Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 20 Nov 2009 12:04:27 -0800
Subject: Quick fix for Safari XHTML error... the map doesn't currently work
 with Safari, but this gets the whole page parsing again!

---
 plugins/Mapstraction/MapstractionPlugin.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/Mapstraction')

diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php
index daedaf40d..c0c2c5b8e 100644
--- a/plugins/Mapstraction/MapstractionPlugin.php
+++ b/plugins/Mapstraction/MapstractionPlugin.php
@@ -179,7 +179,9 @@ class MapstractionPlugin extends Plugin
         }
 
         $action->elementStart('script', array('type' => 'text/javascript'));
+        $action->raw('/*<![CDATA[*/'); // XHTML compat for Safari
         $action->raw('var _notices = ' . json_encode($jsonArray));
+        $action->raw('/*]]>*/'); // XHTML compat for Safari
         $action->elementEnd('script');
 
         return true;
-- 
cgit v1.2.3-54-g00ecf