add 'invite-only' mode for registration

[quix0rs-gnu-social.git] / actions / noticesearch.php

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 29527c56725c721486b2d234bf2b4c108fac2826..e6de21ae068be9c818a10c6ff1e7d037fa4c37db 100644 (file)
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -40,7 +40,12 @@ class NoticesearchAction extends SearchAction {
 
                # lcase it for comparison
                $q = strtolower($q);
-               $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+
+               if(common_config('db','type')=='mysql') {
+                       $notice->whereAdd('MATCH(content) against (\''.addslashes($q).'\')');
+               } else {
+                       $notice->whereAdd('to_tsvector(\'english\', content) @@ plainto_tsquery(\''.addslashes($q).'\')');
+               }
 
                # Ask for an extra to see if there's more.
 
@@ -85,6 +90,11 @@ class NoticesearchAction extends SearchAction {
 
        function show_notice($notice, $terms) {
                $profile = $notice->getProfile();
+               if (!$profile) {
+                       common_log_db_error($notice, 'SELECT', __FILE__);
+                       $this->server_error(_('Notice without matching profile'));
+                       return;
+               }
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
                                                                                  'id' => 'notice-' . $notice->id));