openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/53171

Hello

Fixed a traceback when opening an old service file. Once an invalid service order is opened and saved the footer is corrected.
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/53171
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-03-04 17:31:23 +0000
+++ openlp/core/lib/serviceitem.py	2011-03-13 15:17:47 +0000
@@ -183,6 +183,10 @@
         else:
             log.error(u'Invalid value renderer :%s' % self.service_item_type)
         self.title = clean_tags(self.title)
+        # The footer should never be None, but to be compatible with older
+        # release of OpenLP, we have to correct this to avoid tracebacks.
+        if self.raw_footer is None:
+            self.raw_footer = []
         self.foot_text = \
             u'<br>'.join([footer for footer in self.raw_footer if footer])