Merge remote-tracking branch 'origin/master'

tvdstaaij · Apr 4, 2016 · 40fede6 · 40fede6
2 parents b5469c3 + 8fa1cb6
commit 40fede6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/formatters/html.rb b/formatters/html.rb
@@ -133,8 +133,8 @@ def format_dialog(dialog, messages)
         last = msg['media']['last_name']
         msg_body = "<div class=contact>Contact: #{first} <!--first-last-->#{last}, +#{phone}</div>"
       end
-      if msg['event'] == 'service' or msg['service'] or (message_count % timestamps_every == 0 and timestamps_every > 0)
-        if message_count % timestamps_every == 0
+      if msg['event'] == 'service' or msg['service'] or (timestamps_every > 0 and message_count % timestamps_every == 0)
+        if timestamps_every > 0 and message_count % timestamps_every == 0
           text = date_message
         else
           if get_full_name(msg['from']) != '' # Some messages have no properly filled 'from'