Merge pull request #9224 from annando/issue-9165

Issue 9165:  Make pager work for search

diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php
index 6fdb014..3bb4e7e 100644 (file)
--- a/src/Worker/MergeContact.php
+++ b/src/Worker/MergeContact.php
@@ -52,6 +52,7 @@ class MergeContact
                // These fields only contain public contact entries (uid = 0)
                if ($uid == 0) {
                        DBA::update('post-tag', ['cid' => $new_cid], ['cid' => $old_cid]);
+                       DBA::delete('post-tag', ['cid' => $old_cid]);
                        DBA::update('item', ['author-id' => $new_cid], ['author-id' => $old_cid]);
                        DBA::update('item', ['owner-id' => $new_cid], ['owner-id' => $old_cid]);
                        DBA::update('thread', ['author-id' => $new_cid], ['author-id' => $old_cid]);

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index bf2123b..c8fc42a 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -1503,6 +1503,12 @@ aside .panel-body {
        position: relative;
 }
 
+/* Workaround for Firefox where the post heading covers the avatar, preventing hovercard interaction,
+ 48px is the width of the avatar image and should be adjusted accordingly if it ever changes. */
+.media .dropdown.pull-left + [role=heading] {
+       margin-left: 48px;
+}
+
 .preferences {
     position: absolute;
     right: 0;