Merge branch 'master' of gitorious.org:social/mainline into social-master

[quix0rs-gnu-social.git] / plugins / QnA / QnAPlugin.php

diff --git a/plugins/QnA/QnAPlugin.php b/plugins/QnA/QnAPlugin.php
index 184274506fa9ac995e88e9a2c6cb02b4a73333cd..056d7a2582dd24bc3444151dedafd0607259b2c0 100644 (file)
--- a/plugins/QnA/QnAPlugin.php
+++ b/plugins/QnA/QnAPlugin.php
@@ -80,7 +80,7 @@ class QnAPlugin extends MicroAppPlugin
      * @return boolean hook value; true means continue processing, false means stop.
      */
 
-    function onRouterInitialized(URLMapper $m)
+    public function onRouterInitialized(URLMapper $m)
     {
         $UUIDregex = '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}';
 
@@ -339,7 +339,7 @@ class QnAPlugin extends MicroAppPlugin
         $nli->showNoticeLink();
         $nli->showNoticeSource();
         $nli->showNoticeLocation();
-        $nli->showContext();
+        $nli->showPermalink();
         $nli->showRepeat();
 
         $nli->showNoticeOptions();
@@ -439,13 +439,13 @@ class QnAPlugin extends MicroAppPlugin
         }
     }
 
-    function onEndShowScripts($action)
+    function onEndShowScripts(Action $action)
     {
         $action->script($this->path('js/qna.js'));
         return true;
     }
 
-    function onEndShowStyles($action)
+    function onEndShowStyles(Action $action)
     {
         $action->cssLink($this->path('css/qna.css'));
         return true;