From aa3dff30b5bfd02fd91c10f25a60dcaf0f060e3a Mon Sep 17 00:00:00 2001
From: Chris Leppanen <chris.leppanen@gmail.com>
Date: Tue, 7 Aug 2012 22:47:36 -0700
Subject: [PATCH] Issue #1690434 by twistor | jzornig: Fixed Notice: Undefined
variable: job in FeedsSource->scheduleClear() (line 319 of
sites/all/modules/feeds/includes/FeedsSource.inc).
---
includes/FeedsSource.inc | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/includes/FeedsSource.inc b/includes/FeedsSource.inc
index d8063c9b..71338420 100644
--- a/includes/FeedsSource.inc
+++ b/includes/FeedsSource.inc
@@ -305,18 +305,19 @@ class FeedsSource extends FeedsConfigurable {
* Schedule background clearing tasks.
*/
public function scheduleClear() {
- // Schedule as soon as possible if batch is not complete.
- if ($this->progressClearing() !== FEEDS_BATCH_COMPLETE) {
- $job = array(
- 'type' => $this->id,
- 'id' => $this->feed_nid,
- 'period' => 0,
- 'periodic' => TRUE,
- );
- JobScheduler::get('feeds_source_clear')->set($job);
+ $job = array(
+ 'type' => $this->id,
+ 'id' => $this->feed_nid,
+ 'period' => 0,
+ 'periodic' => TRUE,
+ );
+ // Remove job if batch is complete.
+ if ($this->progressClearing() === FEEDS_BATCH_COMPLETE) {
+ JobScheduler::get('feeds_source_clear')->remove($job);
}
+ // Schedule as soon as possible if batch is not complete.
else {
- JobScheduler::get('feeds_source_clear')->remove($job);
+ JobScheduler::get('feeds_source_clear')->set($job);
}
}
--
GitLab