Merge branch 'master' into FeedPoller

diff --git a/plugins/Cronish/CronishPlugin.php b/plugins/Cronish/CronishPlugin.php
index b0c0095542cc39bb796538ef6b5b01dca5339c5a..0b17fd3660fc80a5c73a1ed062c579c7f92928c8 100644 (file)
--- a/plugins/Cronish/CronishPlugin.php
+++ b/plugins/Cronish/CronishPlugin.php
@@ -1,6 +1,21 @@
 <?php
+/**
+ * GNU social cronish plugin, to imitate cron actions
+ *
+ * @category  Cron
+ * @package   GNUsocial
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2013 Free Software Foundation, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://www.gnu.org/software/social/
+ */
 
 class CronishPlugin extends Plugin {
+    public function onCronMinutely()
+    {
+        common_debug('CRON: Running minutely cron job!');
+    }
+
     public function onCronHourly()
     {
         common_debug('CRON: Running hourly cron job!');

diff --git a/plugins/Cronish/lib/cronish.php b/plugins/Cronish/lib/cronish.php
index c7d79eeb5f21902b3d356e5cef06af681387c05b..5889b079f432634873602dd6556ff5913c8f229e 100644 (file)
--- a/plugins/Cronish/lib/cronish.php
+++ b/plugins/Cronish/lib/cronish.php
@@ -23,7 +23,8 @@ class Cronish
      */
     public function callTimedEvents()
     {
-        $timers = array('hourly' => 3600,
+        $timers = array('minutely' => 60,   // this is NOT guaranteed to run every minute (only on busy sites)
+                        'hourly' => 3600,
                         'daily'  => 86400,
                         'weekly' => 604800);