Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
feeds
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
drupal.org
feeds
Commits
5a6f56dc
Commit
5a6f56dc
authored
14 years ago
by
Alex Barth
Browse files
Options
Downloads
Patches
Plain Diff
#906654 alex_b: Fix phantom subscriptions.
parent
5959bcb0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
includes/FeedsSource.inc
+10
-3
10 additions, 3 deletions
includes/FeedsSource.inc
with
11 additions
and
3 deletions
CHANGELOG.txt
+
1
−
0
View file @
5a6f56dc
...
...
@@ -3,6 +3,7 @@
Feeds 6.x xxxxxxxxxxxxxxxxxxxxxx
--------------------------------
- #906654 alex_b: Fix phantom subscriptions.
- #867892 alex_b: PubSubHubbub - slow down import frequency of feeds that are
subscribed to hub.
- #908964 alex_b: Break out scheduler. Note: Features depends on Job Scheduler
...
...
This diff is collapsed.
Click to expand it.
includes/FeedsSource.inc
+
10
−
3
View file @
5a6f56dc
...
...
@@ -287,13 +287,20 @@ class FeedsSource extends FeedsConfigurable {
}
/**
* O
verride existing, o
nly return source if
importer and source 'exist'
.
* Only return source if
configuration is persistent and valid
.
*
* @see FeedsConfigurable::existing().
*/
public
function
existing
()
{
$this
->
importer
->
existing
();
return
parent
::
existing
();
// If there is no feed nid given, there must be no content type specified.
// If there is a feed nid given, there must be a content type specified.
// Ensure that importer is persistent (= defined in code or DB).
// Ensure that source is persistent (= defined in DB).
if
((
empty
(
$this
->
feed_nid
)
&&
empty
(
$this
->
importer
->
config
[
'content_type'
]))
||
(
!
empty
(
$this
->
feed_nid
)
&&
!
empty
(
$this
->
importer
->
config
[
'content_type'
])))
{
$this
->
importer
->
existing
();
return
parent
::
existing
();
}
}
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment