solved merging backwards, lol

publify · Mar 15, 2012 · 1b17888 · 1b17888
1 parent 6ebc50f
commit 1b17888
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/app/controllers/admin/content_controller.rb b/app/controllers/admin/content_controller.rb
@@ -6,13 +6,13 @@ class Admin::ContentController < Admin::BaseController
 
   cache_sweeper :blog_sweeper
   def merge
-    article_id = params[:article][:keywords]
+
     if article_id.to_i != 0
-      first_article= Article.find_by_id(article_id)
-      first_article.merge_with(params[:id])
+      second_article_id = params[:article][:keywords]
+      first_article= Article.find_by_id(params[:id])
+      first_article.merge_with(second_article_id)
     end
-
-    #redirect_to("/admin/content")
+    redirect_to("/admin/content")
   end
 
   def auto_complete_for_article_keywords