Plugins didn't match lib/plugin.php onPluginVersion function definition

[quix0rs-gnu-social.git] / plugins / Poll / PollPlugin.php

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 45f95b49062058b348be01b3c2b03186b2d48089..53a491ef4776918d27ae6db14848bcc95d06c37e 100644 (file)
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -86,11 +86,11 @@ class PollPlugin extends MicroAppPlugin
     /**
      * Map URLs to actions
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      *
      * @return boolean hook value; true means continue processing, false means stop.
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/poll/new',
                     array('action' => 'newpoll'));
@@ -120,7 +120,7 @@ class PollPlugin extends MicroAppPlugin
      *
      * @return value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Poll',
                             'version' => self::VERSION,
@@ -450,18 +450,14 @@ class PollPlugin extends MicroAppPlugin
 
         // If the stored notice is a POLL_OBJECT
         $poll = Poll::getByNotice($stored);
-        if ($poll instanceof Poll and $scoped instanceof Profile) {
-            $response = $poll->getResponse($scoped);
-            if ($response instanceof Poll_response) {
-                // User has already responded; show the results.
+        if ($poll instanceof Poll) {
+            if (!$scoped instanceof Profile || $poll->getResponse($scoped) instanceof Poll_response) {
+                // Either the user is not logged in or it has already responded; show the results.
                 $form = new PollResultForm($poll, $out);
             } else {
                 $form = new PollResponseForm($poll, $out);
             }
             $form->show();
-        } elseif (!$scoped instanceof Profile) {
-            // TRANS: No current user's profile, so we can't take a reply.
-            $out->text(_m('You must be logged in to respond to this poll.'));
         } else {
             // TRANS: Error text displayed if no poll data could be found.
             $out->text(_m('Poll data is missing'));