Merge branch '0.9.x' into testing

1 files changed, 2 insertions, 4 deletions

diff --git a/plugins/UserFlag/UserFlagPlugin.php b/plugins/UserFlag/UserFlagPlugin.php
index 60c0c2c0a..75dcca4fc 100644
--- a/plugins/UserFlag/UserFlagPlugin.php
+++ b/plugins/UserFlag/UserFlagPlugin.php
@@ -68,7 +68,7 @@ class UserFlagPlugin extends Plugin
         return true;
     }
 
-    function onRouterInitialized(&$m) {
+    function onRouterInitialized($m) {
         $m->connect('main/flag/profile', array('action' => 'flagprofile'));
         $m->connect('admin/profile/flag', array('action' => 'adminprofileflag'));
         return true;
@@ -145,9 +145,7 @@ class UserFlagPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->elementStart('script', array('type' => 'text/javascript'));
-        $action->raw('/*<![CDATA[*/ if ($(".form_entity_flag").length > 0) { SN.U.FormXHR($(".form_entity_flag")); } /*]]>*/');
-        $action->elementEnd('script');
+        $action->inlineScript('if ($(".form_entity_flag").length > 0) { SN.U.FormXHR($(".form_entity_flag")); }');
         return true;
     }
 }