Improved contact menu

[friendica.git] / include / text.php

diff --git a/include/text.php b/include/text.php
index 9a65224af9bfd4e3d8ae19b5f7b97c67734b6038..4ce634b603438bab43c76dfdb0c284c7e5f71861 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -970,7 +970,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) {
                        . (($click) ? ' fakelink' : '') . '" '
                        . (($redir) ? ' target="redir" ' : '')
                        . (($url) ? ' href="' . $url . '"' : '') . $click . ' ><img class="contact-block-img' . $class . $sparkle . '" src="'
-                       . proxy_url($contact['micro']) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
+                       . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name']
                        . '" /></a></div>' . "\r\n";
        }
 }}
@@ -998,12 +998,15 @@ function search($s,$id='search-box',$url='/search',$save = false, $aside = true)
                        '$savedsearch' => feature_enabled(local_user(),'savedsearch'),
                );
 
-       if (!$aside)
+       if (!$aside) {
                $values['$searchoption'] = array(
                                        t("Full Text"),
                                        t("Tags"),
-                                       t("Contacts"),
-                                       t("Forums"));
+                                       t("Contacts"));
+
+               if (get_config('system','poco_local_search'))
+                       $values['$searchoption'][] = t("Forums");
+       }
 
         return replace_macros(get_markup_template('searchbox.tpl'), $values);
 }}
@@ -1407,9 +1410,6 @@ function prepare_body(&$item,$attach = false, $preview = false) {
        put_item_in_cache($item, true);
        $s = $item["rendered-html"];
 
-       require_once("mod/proxy.php");
-       $s = proxy_parse_html($s);
-
        $prep_arr = array('item' => $item, 'html' => $s, 'preview' => $preview);
        call_hooks('prepare_body', $prep_arr);
        $s = $prep_arr['html'];