Fixes for BrowserCMS 3.5.x

app/models/bcms_blog/blog.rb

@@ -59,7 +59,11 @@ def render
         finder = posts.published_between(@date, @date + 1.year)
       end
 
-      @blog_posts = finder.all(:limit => 25, :order => "published_at desc")
+      @blog_posts = finder.where(:published => true)
+                          .where('published_at <= ?', DateTime.now)
+                          .order('published_at DESC')
+                          .limit(25)
+
       raise ActiveRecord::RecordNotFound.new("No posts found") if @blog_posts.empty?
 
       if params[:category]

app/views/bcms_blog/blogs/_form.html.erb

@@ -5,7 +5,7 @@
   <label>Permissions</label>
   <%= hidden_field_tag "blog[group_ids][]", "", :id => nil %>
   <div class="checkboxes">
-    <% for group in Cms::Group.cms_access.all(:order => "groups.name") %>
+    <% for group in Cms::Group.cms_access.all(:order => 'cms_groups.name') %>
     <div class="checkbox_fields">
         <%= check_box_tag "blog[group_ids][]", group.id,
             @block.groups.include?(group), :class => "cms_group_ids", :id => "cms_group_ids_#{group.id}", :tabindex => next_tabindex %>

db/migrate/20090415000003_add_attachment_to_blog_posts.rb

@@ -1,21 +1,21 @@
 class AddAttachmentToBlogPosts < ActiveRecord::Migration
   def self.up
-    change_table :blog_posts do |t|
+    change_table :cms_blog_posts do |t|
       t.belongs_to :attachment
       t.integer :attachment_version
     end
-    change_table :blog_post_versions do |t|
+    change_table :cms_blog_post_versions do |t|
       t.belongs_to :attachment
       t.integer :attachment_version
     end
   end
 
   def self.down
-    change_table :blog_posts do |t|
+    change_table :cms_blog_posts do |t|
       t.remove :attachment
       t.remove :attachment_version
     end
-    change_table :blog_post_versions do |t|
+    change_table :cms_blog_post_versions do |t|
       t.remove :attachment
       t.remove :attachment_version
     end

db/migrate/20100521042244_add_moderate_comments_to_blog.rb

@@ -1,10 +1,10 @@
 class AddModerateCommentsToBlog < ActiveRecord::Migration
   def self.up
-    add_content_column :blogs, :moderate_comments, :boolean, :default => true
+    add_content_column :cms_blogs, :moderate_comments, :boolean, :default => true
   end
 
   def self.down
-    remove_column :blogs, :moderate_comments
-    remove_column :blog_versions, :moderate_comments
+    remove_column :cms_blogs, :moderate_comments
+    remove_column :cms_blog_versions, :moderate_comments
   end
 end

db/migrate/20120529184028_v130.rb

@@ -3,6 +3,14 @@
 # Upgrade this module to v1.3.0 of BcmsBlog (Rails 3.2/CMS 3.5.x compatible)
 class V130 < ActiveRecord::Migration
   def change
+
+    rename_table "cms_blogs", "blogs"
+    rename_table "cms_blog_versions", "blog_versions"
+    rename_table "cms_blog_posts", "blog_posts"
+    rename_table "cms_blog_post_versions", "blog_post_versions"
+    rename_table "cms_blog_comments", "blog_comments"
+    rename_table "cms_blog_comment_versions", "blog_comment_versions"
+
     ["Blog", "BlogPost", "BlogComment"].each do |model|
       v3_5_0_apply_namespace_to_block("BcmsBlog", model)
     end