fix json_encode on url's

[friendica.git] / mod / dfrn_confirm.php

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 58473146d19c37b197f0f69e6cde0617d8ffdc92..4e2a70e048f8978e94df92aa6d367ed370d2a539 100644 (file)
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -423,9 +423,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                                $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
                                $arr['verb'] = ACTIVITY_FRIEND;
                                $arr['object-type'] = ACTIVITY_OBJ_PERSON;
-                               $arr['body'] = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url] ' . t('is now friends with')
-                                       . ' [url=' . $contact['url'] . ']' . $contact['name'] . '[/url]' . "\n\n\n" 
-                                       . ' [url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+                               
+                               $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
+                               $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+                               $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
+                               $arr['body'] =  sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$Bphoto;
 
                                $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
                                        . '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
@@ -637,8 +639,8 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
                if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
                        $tpl = (($new_relation == REL_BUD) 
-                               ? load_view_file('view/friend_complete_eml.tpl')
-                               : load_view_file('view/intro_complete_eml.tpl'));
+                               ? get_intltext_template('friend_complete_eml.tpl')
+                               : get_intltext_template('intro_complete_eml.tpl'));
                
                        $email_tpl = replace_macros($tpl, array(
                                '$sitename' => $a->config['sitename'],