Permalink
Browse files

Merge branch 'master' of github.com:phergie/phergie

  • Loading branch information...
elazar committed Jul 1, 2012
2 parents 315e30d + 7d02cf4 commit bff3ba09c80a9117f090311f2f571564aaebdc02
Showing with 6 additions and 3 deletions.
  1. +3 −0 Phergie/Plugin/Ctcp.php
  2. +3 −3 Phergie/Plugin/FeedTicker.php
View
@@ -51,6 +51,9 @@ public function onTime()
*/
public function onVersion()
{
+ if ($this->getEvent()->getArguments()) {
+ return;
+ }
$source = $this->getEvent()->getSource();
$msg = 'Phergie ' . Phergie_Bot::VERSION . ' (http://phergie.org)';
$this->doVersion($source, $msg);
@@ -133,7 +133,7 @@ public function onLoad()
public function feedCheckingCallback()
{
$now = time();
- $idleTime = intval($this->getConfig('FeedTicker.idleTime', 60*60*2));
+ $idleTime = intval($this->getConfig('FeedTicker.idleTime', 7200)); //7200=60*60*2
$time = $now - $idleTime;
$feeds = $this->plugins->getPlugin('FeedManager')->getFeedsList();
$smartReader = (bool) $this->getConfig('FeedTicker.smartReader', false);
@@ -196,7 +196,7 @@ public function feedCheckingCallback()
}
// Check if is time to delivery items
- $showDelayTime = intval($this->getConfig('FeedTicker.showDelayTime', 60*3));
+ $showDelayTime = intval($this->getConfig('FeedTicker.showDelayTime', 180)); //180=60*3
if (($this->lastDeliveryTime + $showDelayTime) > time()) {
return;
}
@@ -240,7 +240,7 @@ public function getFeed($url, $updated=0, $etag='')
if ($lm < $updated) {
return false;
}
- } else if ($etag == $header['etag']) {
+ } else if ( isset($header['etag']) && $etag == $header['etag']) {
return false;
}
} else {

0 comments on commit bff3ba0

Please sign in to comment.