From f0a75efe0a90adf201cca92037e672aebcaafb87 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 23 Dec 2010 17:09:08 -0500
Subject: [PATCH] Forcing merge_feeds to respect insertion order.

---
 apps/rss_feeds/models.py | 4 ++--
 media/css/reader.css     | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index 0a17ece3c..8c6429d36 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -958,10 +958,10 @@ class DuplicateFeed(models.Model):
     duplicate_feed_id = models.CharField(max_length=255, null=True)
     feed = models.ForeignKey(Feed, related_name='duplicate_addresses')
 
-def merge_feeds(original_feed_id, duplicate_feed_id):
+def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
     from apps.reader.models import UserSubscription, UserSubscriptionFolders, MUserStory
     from apps.analyzer.models import MClassifierTitle, MClassifierAuthor, MClassifierFeed, MClassifierTag
-    if original_feed_id > duplicate_feed_id:
+    if original_feed_id > duplicate_feed_id and not force:
         original_feed_id, duplicate_feed_id = duplicate_feed_id, original_feed_id
     try:
         original_feed = Feed.objects.get(pk=original_feed_id)
diff --git a/media/css/reader.css b/media/css/reader.css
index b5f8613ef..0b928b818 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -2646,7 +2646,8 @@ a.NB-splash-link:hover {
   color: #3F3D6E;
   font-size: 10px;
   font-weight: normal;
-  height: 11px;
+  height: 12px;
+  line-height: 16px;
   padding: 4px 0 4px 4px;
   overflow: hidden;
 }