Merge in Phergie changes

2010-08-12 11:58:53 -07:00
parent d2c72d8ae1
commit a3fea6f673
16 changed files with 1513 additions and 590 deletions
--- a/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
+++ b/plugins/Irc/extlib/phergie/Phergie/Plugin/Cron.php
@@ -110,7 +110,7 @@ class Phergie_Plugin_Cron extends Phergie_Plugin_Abstract
     */
    public function onTick()
    {
-        $now = time();
+        $time = time();
        foreach ($this->callbacks as $key => &$callback) {
            $callbackString = $this->getCallbackString($callback);