0
@@ -9,7 +9,7 @@
0
   def show
0
     @category = Category.find(params[:id], :include => :forums)
0
     @forums = @category.forums
0
-    @topics = Topic.paginate(:page => params[:page], :include => [:user, :forum, :last_poster], :order => 'topics.sticky desc, topics.last_post_at desc', :conditions => ["forum_id in (?)", @forums.collect(&:id)])
0
+    @topics = Topic.paginate(:page => params[:page], :include => [:user, :forum, :last_poster], :order => 'topics.topics.last_post_at desc', :conditions => ["forum_id in (?)", @forums.collect(&:id)])
0
     render(:template => "topics/index")
0
   end
0
   

0
@@ -7,7 +7,7 @@
0
       @chatters = User.chatting
0
       @events = Event.find(:all, :conditions => ['date between ? and ?', @date.strftime("%Y-%m") + '-01', @date.next_month.strftime("%Y-%m") + '-01'])
0
       @headers = Header.find(:all, :limit => 3, :include => :user, :order => 'headers.created_at desc')
0
-      @topics = Topic.find(:all, :limit => 20, :include => [:user, :forum, :last_poster], :order => 'topics.sticky desc, topics.last_post_at desc')
0
+      @topics = Topic.find(:all, :limit => 20, :include => [:user, :forum, :last_poster], :order => 'topics.topics.last_post_at desc')
0
       @uploads = Upload.find(:all, :limit => 5, :include => :user, :order => 'uploads.updated_at desc')
0
       @users = User.find(:all, :limit => 3, :order => 'profile_updated_at desc')
0
   end

0
@@ -19,13 +19,13 @@
0
   def self.last
0
     find(:first, :order => 'id desc')
0
   end
0
+    
0
+  def self.get
0
+    find(:all, :limit => 50, :order => 'messages.id desc', :include => :user)
0
+  end
0
   
0
   def self.more(id)
0
     find(:all, :limit => 100, :order => 'messages.id desc', :include => :user, :conditions => ['messages.id < ?', id])
0
-  end
0
-  
0
-  def self.get
0
-    find(:all, :limit => 100, :order => 'messages.id desc', :include => :user)
0
   end
0
   
0
   def self.refresh(id, current_user)

0
@@ -1,5 +1,5 @@
0
 ActionController::Routing::Routes.draw do |map|
0
-
0
+  
0
   map.root :controller => 'home'
0
   
0
   map.resources :avatars, :member => { :select => :post, :deselect => :post }
0
@@ -15,7 +15,7 @@
0
   map.resources :themes, :member => { :select => :post, :deselect => :post }
0
   map.resources :topics, :member => { :show_new => :get }
0
   map.resources :uploads
0
-  map.resources :users, :member => { :posts => :get, :confirm_delete => :get, :admin => :post, :ban => :get, :remove_ban => :post }
0
+  map.resources :users, :member => { :posts => :get, :admin => :post, :ban => :get, :remove_ban => :post, :confirm_delete => :get }
0
   
0
   map.search 'search', :controller => 'search', :action => 'index'
0
   map.refresh_chatters 'refresh_chatters', :controller => 'messages', :action => 'refresh_chatters'
0
0
0
0
@@ -23,11 +23,12 @@
0
   map.login 'login', :controller => 'users', :action => 'login'
0
   map.logout 'logout', :controller => 'users', :action => 'logout'
0
   map.register 'register', :controller => 'users', :action => 'new'
0
+  
0
   map.admin 'admin', :controller => 'settings', :action => 'index'
0
-  map.files 'files', :controller => 'uploads', :action => 'index'
0
   map.chat 'chat', :controller => 'messages', :action => 'index'
0
+  map.files 'files', :controller => 'uploads', :action => 'index'
0
   map.forum_root 'forum', :controller => 'forums', :action => 'index'
0
-    
0
+    
0
   map.exceptions 'logged_exceptions/:action/:id', :controller => 'logged_exceptions', :action => 'index', :id => nil
0
   
0
   map.catch_all '*path', :controller => 'topics', :action => 'unknown_request'