[commits] (rae) [16099] Fix for bug 11624 (Conflict on deleted recurring item causes traceback), r=Jeffrey

[commits]

Title: [commits] (rae) [16099] Fix for bug 11624 (Conflict on deleted recurring item causes traceback), r=Jeffrey

Revision

16099

Author

rae

Date

2007-12-10 14:12:17 -0800 (Mon, 10 Dec 2007)

Log Message

Fix for bug 11624 (Conflict on deleted recurring item causes traceback), r=Jeffrey

Modified Paths

• trunk/chandler/application/dialogs/ConflictDialog.py

Diff

Modified: trunk/chandler/application/dialogs/ConflictDialog.py (16098 => 16099)

--- trunk/chandler/application/dialogs/ConflictDialog.py	2007-12-10 20:40:36 UTC (rev 16098)
+++ trunk/chandler/application/dialogs/ConflictDialog.py	2007-12-10 22:12:17 UTC (rev 16099)
@@ -85,8 +85,9 @@
         """
         Convert "&" to "&amp;" and "<" to "&lt;"
         """
-        for pattern in (REPLACEMENTS):
-            text = text.replace(pattern[0], pattern[1])
+        if text is not None:
+            for pattern in (REPLACEMENTS):
+                text = text.replace(pattern[0], pattern[1])
         return text
 
     def UnescapeText(self):

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits