diff options
| author | Evan Prodromou <evan@status.net> | 2009-12-01 12:11:05 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2009-12-01 12:11:05 -0500 |
| commit | 42da45d3bc3cd0caa34f8d9f34c5617fedbb755e (patch) | |
| tree | 4bb8483ad921fd1c03b0f4043d541dff1a812d50 /plugins/Mapstraction | |
| parent | 11d9c1955c9a7d65cb3dc76098abd3e4350d2685 (diff) | |
| parent | 234e6a10b1b95b271bacd11687e1dcb168712147 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
Diffstat (limited to 'plugins/Mapstraction')
| -rw-r--r-- | plugins/Mapstraction/MapstractionPlugin.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/Mapstraction/MapstractionPlugin.php b/plugins/Mapstraction/MapstractionPlugin.php index eabd0d0f0..c0c2c5b8e 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'), @@ -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; @@ -226,8 +228,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); |