Index: codereview/peerReviewPerform.py
===================================================================
--- codereview/peerReviewPerform.py	(revision 1425)
+++ codereview/peerReviewPerform.py	(working copy)
@@ -163,14 +163,14 @@
             
         mimeview = Mimeview(self.env)
         rev = None
-        content = node.get_content().read(mimeview.max_preview_size())
+        content = node.get_content().read(mimeview.max_preview_size)
         if not is_binary(content):
             if mime_type != 'text/plain':
                 plain_href = self.env.href.peerReviewBrowser(node.path, rev=rev and node.rev, format='txt')
                 add_link(req, 'alternate', plain_href, 'Plain Text', 'text/plain')
                 
         #assign the preview to a variable for clearsilver
-        req.hdf['file'] = mimeview.preview_to_hdf(req, mime_type, charset, content, node.name, node.rev, annotations=['performCodeReview'])
+        req.hdf['file'] = mimeview.preview_to_hdf(req, content, len(content), mime_type, node.name, node.rev, annotations=['performCodeReview'])
         
 	add_stylesheet(req, 'common/css/code.css')
 	add_stylesheet(req, 'common/css/browser.css')	
Index: codereview/peerReviewCommentCallback.py
===================================================================
--- codereview/peerReviewCommentCallback.py	(revision 1425)
+++ codereview/peerReviewCommentCallback.py	(working copy)
@@ -111,7 +111,7 @@
 	
 	if req.args.has_key('FileUp'):
    	     upload = req.args['FileUp']
-             if upload.filename:
+             if hasattr(upload, 'filename') and upload.filename:
                  self.path = os.path.join(self.env.path, 'attachments', 'CodeReview', urllib.quote(struct.IDFile))
                  self.path = os.path.normpath(self.path) 
                  size = 0
Index: codereview/peerReviewBrowser.py
===================================================================
--- codereview/peerReviewBrowser.py	(revision 1425)
+++ codereview/peerReviewBrowser.py	(working copy)
@@ -224,8 +224,7 @@
                                                        format='txt')
                     add_link(req, 'alternate', plain_href, 'Plain Text',
                              'text/plain')
-            req.hdf['file'] = mimeview.preview_to_hdf(req, mime_type, charset,
-                                                      content,
+            req.hdf['file'] = mimeview.preview_to_hdf(req, content, len(content), mime_type,
                                                       node.name, node.rev,
                                                       annotations=['addFileNums'])