Commit 299efd99 authored by Hanno Schlichting's avatar Hanno Schlichting

Applied missing bit of the code merge for LP #713253 (c120128).

parent 1989c280
...@@ -11,6 +11,7 @@ http://docs.zope.org/zope2/releases/. ...@@ -11,6 +11,7 @@ http://docs.zope.org/zope2/releases/.
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
- Applied missing bit of the code merge for LP #713253.
2.13.3 (2011-02-06) 2.13.3 (2011-02-06)
------------------- -------------------
......
...@@ -140,8 +140,6 @@ class DefaultPublishTraverse(object): ...@@ -140,8 +140,6 @@ class DefaultPublishTraverse(object):
# object has a pseudo-docstring for the object. Objects that # object has a pseudo-docstring for the object. Objects that
# have an empty or missing docstring are not published. # have an empty or missing docstring are not published.
doc = getattr(subobject, '__doc__', None) doc = getattr(subobject, '__doc__', None)
if doc is None:
doc = getattr(object, '%s__doc__' % name, None)
if not doc: if not doc:
raise Forbidden( raise Forbidden(
"The object at %s has an empty or missing " \ "The object at %s has an empty or missing " \
......
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