Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / search_engines.php

diff --git a/lib/search_engines.php b/lib/search_engines.php
index 7f1684a3e756b0a2cd7ea3b4ba79970bb4486915..6014c89923e302e8584fff2f5f0b5aac555d394f 100644 (file)
--- a/lib/search_engines.php
+++ b/lib/search_engines.php
@@ -84,7 +84,6 @@ class MySQLSearch extends SearchEngine
                 $this->target->whereAdd('MATCH(nickname, fullname, location, bio, homepage) ' .
                                         'AGAINST (\''.$this->target->escape(strtolower($q)).'\' IN BOOLEAN MODE)', 'OR');
             }
-            return true;
         } else if ('notice' === $this->table) {
 
             // Don't show imported notices
@@ -100,10 +99,11 @@ class MySQLSearch extends SearchEngine
                                          'AGAINST (\''.$this->target->escape($q).'\' IN BOOLEAN MODE)');
             }
 
-            return true;
         } else {
             throw new ServerException('Unknown table: ' . $this->table);
         }
+
+        return true;
     }
 }