Fixed a small error where $P in a person box when the person has not

been married does not remove the format string.  Found by Adam Stein.


svn: r19944
This commit is contained in:
Craig J. Anderson 2012-07-02 13:41:58 +00:00
parent f160ba8c64
commit 2580665600

View File

@ -816,15 +816,14 @@ class VariableParse(object):
return None
def __parse_photo(self, person_or_marriage):
if person_or_marriage is None:
return
photo = self.__get_photo(person_or_marriage)
photo_f = GalleryFormat(self.database, self._in)
if person_or_marriage is None:
return photo_f.parse_empty()
photo = self.__get_photo(person_or_marriage)
if photo:
return photo_f.parse_format(photo)
else:
photo_f.parse_empty()
return
return photo_f.parse_empty()
def parse_format(self):
"""Parse the $ variables. """