From 0e99f04c43b8631b9a5cc033d70cf827a119f9a9 Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Tue, 16 Feb 2016 11:54:47 +0100
Subject: [PATCH] update from git.gnu.io

---
 actions/apitimelinefriendshiddenreplies.php | 13 ++++++++++++-
 css/qvitter.css                             |  4 ++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/actions/apitimelinefriendshiddenreplies.php b/actions/apitimelinefriendshiddenreplies.php
index c47fdab..f3f5df6 100644
--- a/actions/apitimelinefriendshiddenreplies.php
+++ b/actions/apitimelinefriendshiddenreplies.php
@@ -390,6 +390,8 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
     protected $target  = null;
     protected $inbox = null;
 
+    protected $selectVerbs = array();
+
     /**
      * Constructor
      *
@@ -397,6 +399,7 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
      */
     function __construct(Profile $target)
     {
+        parent::__construct();
         $this->target  = $target;
     }
 
@@ -453,9 +456,17 @@ class RawInboxNoticeStreamHiddenReplies extends NoticeStream
         if (!empty($max_id)) {
             $notice->whereAdd(sprintf('notice.id <= %d', $max_id));
         }
-        if (!empty($this->selectVerbs)) {
+
+        // We have changed how selectVerbs work in GNUsocial, so it's an associative array
+        // where each verb is in the key and then the value (true/false) is how to filter.
+        // $this->unselectVerbs is always unset in newer GNUsocials.
+        if (!isset($this->unselectVerbs)) {
+            self::filterVerbs($notice, $this->selectVerbs);
+        } elseif (!empty($this->selectVerbs)) {
+            // old behaviour was just if there were selectVerbs set
             $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
         }
+
         $notice->limit($offset, $limit);
         // notice.id will give us even really old posts, which were
         // recently imported. For example if a remote instance had
diff --git a/css/qvitter.css b/css/qvitter.css
index 5af7e95..481f634 100644
--- a/css/qvitter.css
+++ b/css/qvitter.css
@@ -1609,7 +1609,7 @@ body.rtl #history-container.menu-container a .chev-right {
 	border-image-repeat: stretch stretch;
 	border-image-slice: 100% 100% 100% 100%;
 	border-image-source: none;
-	border-image-width: 1 1 1 1:
+	border-image-width: 1 1 1 1;
 	}
 #feed-header-inner {
 	position:relative;
@@ -1836,7 +1836,7 @@ background-repeat: no-repeat;
 .stream-item.notification .small-grey-notice,
 .stream-item.notification .small-grey-notice a {
 	color:#999;
-	word-break: break-all;
+	word-wrap: break-word;
 	}
 .stream-item.notification .small-grey-notice a:hover {
 	color:#333;