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

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

diff --git a/actions/noticesearchrss.php b/actions/noticesearchrss.php
index a59e7b99becfdb54b3fa2ca18476a7fee2b6b06f..f52d69dfdfd0f992895697801d89d933ed7e075c 100644 (file)
--- a/actions/noticesearchrss.php
+++ b/actions/noticesearchrss.php
@@ -48,13 +48,12 @@ require_once INSTALLDIR.'/lib/rssaction.php';
  */
 class NoticesearchrssAction extends Rss10Action
 {
-
     function init()
     {
         return true;
     }
-    
-    function prepare($args)
+
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->notices = $this->getNotices();
@@ -63,7 +62,6 @@ class NoticesearchrssAction extends Rss10Action
 
     function getNotices($limit=0)
     {
-
         $q = $this->trimmed('q');
         $notices = array();
 
@@ -82,7 +80,11 @@ class NoticesearchrssAction extends Rss10Action
 
         if ($cnt > 0) {
             while ($notice->fetch()) {
-                $notices[] = clone($notice);
+                // Check scope of notice to current profile (including guests)
+                if ($notice->isCurrentProfileInScope()) {
+                    // Is in scope
+                    $notices[] = clone($notice);
+                }
             }
         }
 
@@ -93,9 +95,12 @@ class NoticesearchrssAction extends Rss10Action
     {
         $q = $this->trimmed('q');
         $c = array('url' => common_local_url('noticesearchrss', array('q' => $q)),
+                   // TRANS: RSS notice search feed title. %s is the query.
                    'title' => sprintf(_('Updates with "%s"'), $q),
                    'link' => common_local_url('noticesearch', array('q' => $q)),
-                   'description' => sprintf(_('Updates matching search term "%1$s" on %2$s!'),
+                   // TRANS: RSS notice search feed description.
+                   // TRANS: %1$s is the query, %2$s is the StatusNet site name.
+                   'description' => sprintf(_('Updates matching search term "%1$s" on %2$s.'),
                                             $q, common_config('site', 'name')));
         return $c;
     }
@@ -105,7 +110,7 @@ class NoticesearchrssAction extends Rss10Action
         return null;
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }