[Openlp-core] [Merge] lp:~googol-hush/openlp/bug-788770 into lp:openlp

[Andreas Preikschat]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #788770 in OpenLP: "João Ferreira de Almeida bible verse display 
misalignment"
  https://bugs.launchpad.net/openlp/+bug/788770

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/bug-788770/+merge/62539

Hello,

Quick fix for bug #788770 
-- 
https://code.launchpad.net/~googol-hush/openlp/bug-788770/+merge/62539
Your team OpenLP Core is requested to review the proposed merge of 
lp:~googol-hush/openlp/bug-788770 into lp:openlp.

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2011-05-26 17:11:22 +0000
+++ openlp/core/lib/serviceitem.py	2011-05-26 18:54:59 +0000
@@ -177,10 +177,11 @@
                     .format_slide(slide[u'raw_slide'], line_break, self)
                 for page in formatted:
                     page = page.replace(u'<br>', u'{br}')
+                    html = expand_tags(cgi.escape(page.rstrip()))
                     self._display_frames.append({
                         u'title': clean_tags(page),
                         u'text': clean_tags(page.rstrip()),
-                        u'html': expand_tags(cgi.escape(page.rstrip())),
+                        u'html': html.replace(u'&amp;nbsp;', u'&nbsp;'),
                         u'verseTag': slide[u'verseTag']
                     })
         elif self.service_item_type == ServiceItemType.Image or \


_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to     : openlp-core@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openlp-core
More help   : https://help.launchpad.net/ListHelp