Remove more contractions

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

diff --git a/actions/opensearch.php b/actions/opensearch.php
index 81efcea9bfb0b9cd8da82f23047241816773454b..3136380b0b3e1a7f47fc26540fc71af676c45fff 100644 (file)
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -29,7 +29,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -52,7 +52,7 @@ class OpensearchAction extends Action
      *
      * @param array $args query arguments
      * 
-     * @return boolean false if user doesn't exist
+     * @return boolean false if user does not exist
      */
     function handle($args)
     {
@@ -61,7 +61,7 @@ class OpensearchAction extends Action
         $short_name = '';
         if ($type == 'people') {
             $type       = 'peoplesearch';
-            $short_name = _('People Search');
+            $short_name = _('User Search');
         } else {
             $type       = 'noticesearch';
             $short_name = _('Notice Search');
@@ -75,7 +75,7 @@ class OpensearchAction extends Action
         $this->element('Url', array('type' => 'text/html', 'method' => 'get',
                        'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---')))));
         $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
-        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
+        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), Theme::path('logo.png'));
         $this->element('AdultContent', null, 'false');
         $this->element('Language', null, common_language());
         $this->element('OutputEncoding', null, 'UTF-8');