Browse Source

Correctly count time difference for merge

Ralfp 12 years ago
parent
commit
eca478e2f6
1 changed files with 3 additions and 1 deletions
  1. 3 1
      misago/threads/views/posting.py

+ 3 - 1
misago/threads/views/posting.py

@@ -164,9 +164,11 @@ class PostingView(BaseView):
                 # Create new message
                 # Create new message
                 if self.mode in ['new_thread', 'new_post', 'new_post_quick']:
                 if self.mode in ['new_thread', 'new_post', 'new_post_quick']:
                     # Use last post instead?
                     # Use last post instead?
+                    merge_diff = (now - self.thread.last)
+                    merge_diff = (merge_diff.days * 86400) + merge_diff.seconds
                     if (self.mode in ['new_post', 'new_post_quick']
                     if (self.mode in ['new_post', 'new_post_quick']
                         and request.settings.post_merge_time
                         and request.settings.post_merge_time
-                        and (now - self.thread.last).seconds < (request.settings.post_merge_time * 60)
+                        and merge_diff < (request.settings.post_merge_time * 60)
                         and self.thread.last_poster_id == request.user.id):
                         and self.thread.last_poster_id == request.user.id):
                         # Overtake posting
                         # Overtake posting
                         post = self.thread.last_post
                         post = self.thread.last_post