From a1c8257b29b246f4198b3d5878054e1727167578 Mon Sep 17 00:00:00 2001 From: albert Date: Wed, 27 Feb 2013 00:02:34 -0800 Subject: [PATCH] fixes #633 --- app/assets/javascripts/landings.js | 10 ---------- app/models/user.rb | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 app/assets/javascripts/landings.js diff --git a/app/assets/javascripts/landings.js b/app/assets/javascripts/landings.js deleted file mode 100644 index a595223f0..000000000 --- a/app/assets/javascripts/landings.js +++ /dev/null @@ -1,10 +0,0 @@ -$(function() { - if ($("#c-landings").length) { - $(".data").each(function(i, div) { - var $div = $(div); - var $image = $div.prev(); - - $div.width($image.width() - 10).height($image.height() - 10).offset({top: $image.position().top, left: $image.position().left}); - }); - } -}); diff --git a/app/models/user.rb b/app/models/user.rb index 2574710d2..f2d5613fc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -357,7 +357,7 @@ class User < ActiveRecord::Base module ForumMethods def has_forum_been_updated? return false unless is_privileged? - newest_topic = ForumPost.order("updated_at desc").first + newest_topic = ForumTopic.order("updated_at desc").first return false if newest_topic.nil? return true if last_forum_read_at.nil? return newest_topic.updated_at > last_forum_read_at