Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/lib/libsubstkeyword.py
View File

@ -816,15 +816,14 @@ class VariableParse(object):
return None return None
def __parse_photo(self, person_or_marriage): 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) 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: if photo:
return photo_f.parse_format(photo) return photo_f.parse_format(photo)
else: else:
photo_f.parse_empty() return photo_f.parse_empty()
return
def parse_format(self): def parse_format(self):
"""Parse the $ variables. """ """Parse the $ variables. """