plugins onAutoload now only overloads if necessary (extlibs etc.)

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

diff --git a/plugins/Poll/PollPlugin.php b/plugins/Poll/PollPlugin.php
index 1fadcf108c386885b5c6273d58b9327a80eda9d5..a6292032c51b7cdc41205ff31bec7cd7c10d1bae 100644 (file)
--- a/plugins/Poll/PollPlugin.php
+++ b/plugins/Poll/PollPlugin.php
@@ -81,40 +81,6 @@ class PollPlugin extends MicroAppPlugin
         return true;
     }
 
-    /**
-     * Load related modules when needed
-     *
-     * @param string $cls Name of the class to be loaded
-     *
-     * @return boolean hook value; true means continue processing, false means stop.
-     */
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'ShowpollAction':
-        case 'NewpollAction':
-        case 'RespondpollAction':
-        case 'PollsettingsAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'Poll':
-        case 'Poll_response':
-        case 'User_poll_prefs':
-            include_once $dir.'/'.$cls.'.php';
-            return false;
-        case 'NewPollForm':
-        case 'PollResponseForm':
-        case 'PollResultForm':
-            include_once $dir.'/'.strtolower($cls).'.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     /**
      * Map URLs to actions
      *
@@ -235,7 +201,7 @@ class PollPlugin extends MicroAppPlugin
                     // TRANS: Exception thrown trying to respond to a poll without a poll reference.
                     throw new Exception(_m('Invalid poll response: No poll reference.'));
                 }
-                $poll = Poll::staticGet('uri', $pollUri);
+                $poll = Poll::getKV('uri', $pollUri);
                 if (!$poll) {
                     // TRANS: Exception thrown trying to respond to a non-existing poll.
                     throw new Exception(_m('Invalid poll response: Poll is unknown.'));
@@ -503,9 +469,9 @@ class PollPlugin extends MicroAppPlugin
     function onEndNoticeWhoGets($notice, &$ni) {
         if ($notice->object_type == self::POLL_RESPONSE_OBJECT) {
             foreach ($ni as $id => $source) {
-                $user = User::staticGet('id', $id);
+                $user = User::getKV('id', $id);
                 if (!empty($user)) {
-                    $pollPrefs = User_poll_prefs::staticGet('user_id', $user->id);
+                    $pollPrefs = User_poll_prefs::getKV('user_id', $user->id);
                     if (!empty($pollPrefs) && ($pollPrefs->hide_responses)) {
                         unset($ni[$id]);
                     }