Commit 020e4aa7 authored by Stuart Bishop's avatar Stuart Bishop

Don't blow up if we have references to non-existant products laying around

parent 76a882fb
...@@ -258,6 +258,7 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -258,6 +258,7 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent):
if hasattr(topic,'isAPIHelpTopic') and topic.isAPIHelpTopic: if hasattr(topic,'isAPIHelpTopic') and topic.isAPIHelpTopic:
apitopics.append(topic) apitopics.append(topic)
else: else:
try:
if callable(topic.id): if callable(topic.id):
id=topic.id() id=topic.id()
else: else:
...@@ -269,6 +270,10 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent): ...@@ -269,6 +270,10 @@ class ProductHelp(Acquisition.Implicit, ObjectManager, Item, Persistent):
zpttopics.append(topic) zpttopics.append(topic)
else: else:
topics.append(topic) topics.append(topic)
except ImportError:
# Don't blow up if we have references to non-existant
# products laying around
pass
if dtmltopics: if dtmltopics:
topics = topics + [TreeCollection(' DTML Reference', dtmltopics)] topics = topics + [TreeCollection(' DTML Reference', dtmltopics)]
if apitopics: if apitopics:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment