[Checkins] SVN: z3ext.statusmessage/trunk/ Fix publication afterCall handler

[Nikolay Kim]

Log message for revision 100566:
  Fix publication afterCall handler

Changed:
  U   z3ext.statusmessage/trunk/CHANGES.txt
  U   z3ext.statusmessage/trunk/src/z3ext/statusmessage/handler.py

-=-
Modified: z3ext.statusmessage/trunk/CHANGES.txt
===================================================================
--- z3ext.statusmessage/trunk/CHANGES.txt	2009-05-31 16:32:16 UTC (rev 100565)
+++ z3ext.statusmessage/trunk/CHANGES.txt	2009-06-01 10:39:08 UTC (rev 100566)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.3.6 (2009-06-01)
+------------------
+
+- Fix publication afterCall handler
+
+
 1.3.5 (2009-04-15)
 ------------------
 

Modified: z3ext.statusmessage/trunk/src/z3ext/statusmessage/handler.py
===================================================================
--- z3ext.statusmessage/trunk/src/z3ext/statusmessage/handler.py	2009-05-31 16:32:16 UTC (rev 100565)
+++ z3ext.statusmessage/trunk/src/z3ext/statusmessage/handler.py	2009-06-01 10:39:08 UTC (rev 100566)
@@ -30,19 +30,17 @@
     status = response.getStatus()
     if status not in (302, 303):
         service = IStatusMessage(request, None)
-        if service is None:
-            return
+        if service is not None:
+            messages = service.clear()
 
-        messages = service.clear()
+            if messages:
+                msg = u'\n'.join(messages)
+                msg = msg.encode('utf-8', 'ignore')
 
-        if messages:
-            msg = u'\n'.join(messages)
-            msg = msg.encode('utf-8', 'ignore')
+                body = response.consumeBody()
+                body = body.replace('<!--z3ext-statusmessage-->', msg, 1)
+                response.setResult(body)
 
-            body = response.consumeBody()
-            body = body.replace('<!--z3ext-statusmessage-->', msg, 1)
-            response.setResult(body)
-
     afterCall(self, request, ob)
 
 afterCall = ZopePublication.afterCall