my_forum 0.0.1.beta29 → 0.0.1.beta30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f9f7e3ca4c8bdfc291d5e53c27f602f5023b6d
-  data.tar.gz: c35fb58614dd1bf75170b626df663a359f6e5b36
+  metadata.gz: eec57a96d65caf18e79aafe5e709bf5c5329422d
+  data.tar.gz: bcf4d88f50c8ba6863f4a2c9f0c7deda8faca650
 SHA512:
-  metadata.gz: e820b8589722f67d278cf6a5821fb5f184a9ac5ab384f66bff63672214a34f5ce5ecad25e7cbc5ee922723a79d5476783cd0f00dd22e60a654a24ad6e18702f0
-  data.tar.gz: 4c38f98ecf6fdc739b0ec517dab58cc7562f7f38ae1abce7ebe3f2eb9adb71850b2274ac11a54ae7edd8102585806c8b582221610e5b600c8933b90f768bd083
+  metadata.gz: d7c20f37f6970b61257aa1bd524a5da2105c5df5fd14f8455480fac76328998e5d24ff557384812d46424d82f7cd6cfbe4c01d9754058828e0eda19b8e604dd6
+  data.tar.gz: 9719a7e531db8d6db16b8cc75b570e076127dc4f49cc556bc7ed4122a61b3e8d7ec1fb3be91f725cfc223ec6565b9168ebf26a79afd84ce354b0f822b6c0923f

data/app/controllers/my_forum/welcome_controller.rb

@@ -17,10 +17,10 @@ module MyForum
                         []
                       else
                         Topic.find_by_sql("
-                          SELECT posts.id, posts.user_id, posts.text, posts.topic_id, posts.updated_at, topics.name as topic_name, topics.forum_id FROM my_forum_posts AS posts
+                          SELECT posts.id, posts.user_id, posts.text, posts.topic_id, posts.updated_at, topics.name as topic_name, topics.forum_id, topics.deleted FROM my_forum_posts AS posts
                           LEFT JOIN my_forum_topics AS topics ON posts.topic_id = topics.id
                           LEFT JOIN my_forum_forums AS forums ON forums.id = topics.forum_id
-                          WHERE posts.id IN (SELECT MAX(id) FROM my_forum_posts GROUP BY topic_id) AND posts.is_deleted IS FALSE
+                          WHERE posts.id IN (SELECT MAX(id) FROM my_forum_posts GROUP BY topic_id) AND posts.is_deleted IS FALSE AND topics.deleted IS FALSE
                           ORDER BY posts.id DESC LIMIT 10
                         ")
                       end

data/app/helpers/my_forum/posts_helper.rb

@@ -5,6 +5,9 @@ module MyForum
     end
 
     def format_bbcode(text)
+      # Line Breask
+      text.gsub!(/\r\n/, '<br />')
+
       # Images
       text.gsub!(/\[img\]/i,   '<img src="')
       text.gsub!(/\[\/img\]/i, '" />')

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta29"
+  VERSION = "0.0.1.beta30"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta29
+  version: 0.0.1.beta30
 platform: ruby
 authors:
 - Vitaly Omelchenko