Add a group with one click

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 95792640e3b64484738c73401d40c27dc68a1397..20b54728c9c5c7509f14cf01e9fe1b56c76b735f 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -203,12 +203,11 @@ function localize_item(&$item){
 
                // we can't have a translation string with three positions but no distinguishable text
                // So here is the translate string.
-
                $txt = t('%1$s poked %2$s');
-
+               
                // now translate the verb
-
-               $txt = str_replace( t('poked'), t($verb), $txt);
+               $poked_t = trim(sprintf($txt, "",""));
+               $txt = str_replace( $poked_t, t($verb), $txt);
 
                // then do the sprintf on the translation string
 
@@ -370,6 +369,7 @@ if(!function_exists('conversation')) {
 function conversation(&$a, $items, $mode, $update, $preview = false) {
 
        require_once('include/bbcode.php');
+       require_once('mod/proxy.php');
 
        $ssl_state = ((local_user()) ? true : false);
 
@@ -656,7 +656,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'name' => $profile_name_e,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => $profile_avatar,
+                                       'thumb' => proxy_url($profile_avatar),
                                        'title' => $item['title_e'],
                                        'body' => $body_e,
                                        'tags' => $tags_e,
@@ -675,7 +675,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                        'indent' => '',
                                        'owner_name' => $owner_name_e,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => $owner_photo,
+                                       'owner_photo' => proxy_url($owner_photo),
                                        'plink' => get_plink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,
@@ -1101,16 +1101,16 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
                '$shortsetloc' => t('set location'),
                '$noloc' => t('Clear browser location'),
                '$shortnoloc' => t('clear location'),
-               '$title' => "",
+               '$title' => $x['title'],
                '$placeholdertitle' => t('Set title'),
-               '$category' => "",
+               '$category' => $x['category'],
                '$placeholdercategory' => (feature_enabled(local_user(),'categories') ? t('Categories (comma-separated list)') : ''),
                '$wait' => t('Please wait'),
                '$permset' => t('Permission settings'),
                '$shortpermset' => t('permissions'),
                '$ptyp' => (($notes_cid) ? 'note' : 'wall'),
-               '$content' => '',
-               '$post_id' => '',
+               '$content' => $x['content'],
+               '$post_id' => $x['post_id'],
                '$baseurl' => $a->get_baseurl(true),
                '$defloc' => $x['default_location'],
                '$visitor' => $x['visitor'],