diff options
author | Luke Fitzgerald <lw.fitzgerald@googlemail.com> | 2010-08-04 16:02:24 -0700 |
---|---|---|
committer | Luke Fitzgerald <lw.fitzgerald@googlemail.com> | 2010-08-04 16:02:24 -0700 |
commit | cb34d9519753913138d3831d16687e03d729dabc (patch) | |
tree | 04e0c0014d455e398a9a3a9ed514ee250b85ab96 /plugins/Irc/extlib/phergie/Phergie/Process/Standard.php | |
parent | 65a741cce2a02057e858ab4bbf8b5e8ae8c4a73e (diff) |
Merge in Phergie changes
Diffstat (limited to 'plugins/Irc/extlib/phergie/Phergie/Process/Standard.php')
-rw-r--r-- | plugins/Irc/extlib/phergie/Phergie/Process/Standard.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php index 385c65fa2..24adbaf99 100644 --- a/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php +++ b/plugins/Irc/extlib/phergie/Phergie/Process/Standard.php @@ -1,6 +1,6 @@ <?php /** - * Phergie + * Phergie * * PHP version 5 * @@ -11,7 +11,7 @@ * It is also available through the world-wide-web at this URL: * http://phergie.org/license * - * @category Phergie + * @category Phergie * @package Phergie * @author Phergie Development Team <team@phergie.org> * @copyright 2008-2010 Phergie Development Team (http://phergie.org) @@ -23,7 +23,7 @@ * Connection data processor which reads all connections looking * for a response. * - * @category Phergie + * @category Phergie * @package Phergie * @author Phergie Development Team <team@phergie.org> * @license http://phergie.org/license New BSD License @@ -32,7 +32,7 @@ class Phergie_Process_Standard extends Phergie_Process_Abstract { /** - * Obtains and processes incoming events, then sends resulting outgoing + * Obtains and processes incoming events, then sends resulting outgoing * events. * * @return void @@ -47,11 +47,7 @@ class Phergie_Process_Standard extends Phergie_Process_Abstract if ($event = $this->driver->getEvent()) { $this->ui->onEvent($event, $connection); $this->plugins->setEvent($event); - - if (!$this->plugins->preEvent()) { - continue; - } - + $this->plugins->preEvent(); $this->plugins->{'on' . ucfirst($event->getType())}(); } |