From e1a5a5f8b9c34af8cc4952d189ce14072ecdc131 Mon Sep 17 00:00:00 2001
From: "Craig J. Anderson" <ander882@hotmail.com>
Date: Sun, 29 Apr 2012 13:40:28 +0000
Subject: [PATCH] Fixed an error where a function was not passed

svn: r19406
---
 src/plugins/lib/libsubstkeyword.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/plugins/lib/libsubstkeyword.py b/src/plugins/lib/libsubstkeyword.py
index d1eab43a6..d048d394d 100644
--- a/src/plugins/lib/libsubstkeyword.py
+++ b/src/plugins/lib/libsubstkeyword.py
@@ -923,13 +923,9 @@ class VariableParse(object):
         else:
             return ""
     
-    def __parse_event(self, person):
-        #TODO; this try to avoid a key issue
-        try:
-            event = self.get_event_by_name(person, attrib_parse.get_name())
-            event_f = EventFormat(self.database, self._in)
-        except:
-            return ""
+    def __parse_event(self, person, attrib_parse):
+        event = self.get_event_by_name(person, attrib_parse.get_name())
+        event_f = EventFormat(self.database, self._in)
         if event:
             return event_f.parse_format(event)
         else:
@@ -1049,11 +1045,11 @@ class VariableParse(object):
         elif next_char == "e":
             #person event
             _out.add_variable(
-                self.__parse_event(self.friend.person))
+                self.__parse_event(self.friend.person, attrib_parse))
         elif next_char == "t":
             #person event
             _out.add_variable(
-                self.__parse_event(self.friend.family))
+                self.__parse_event(self.friend.family, attrib_parse))
         
 
 #------------------------------------------------------------------------