diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-30 08:12:28 +0200 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-30 08:12:28 +0200 |
| commit | d22b3a1d9c295f5545cc20e1af786cb79e6553a5 (patch) | |
| tree | a0a6b3cec6b1b4108c62ff689e8842d49226b982 /mod | |
| parent | e2370b56bf9c385ddfcdd004c30a49f24100a916 (diff) | |
| parent | d83bfd464baebf7d203a07d1bd92a00d2734d0ad (diff) | |
| download | volse-hubzilla-d22b3a1d9c295f5545cc20e1af786cb79e6553a5.tar.gz volse-hubzilla-d22b3a1d9c295f5545cc20e1af786cb79e6553a5.tar.bz2 volse-hubzilla-d22b3a1d9c295f5545cc20e1af786cb79e6553a5.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'mod')
| -rwxr-xr-x | mod/dirfind.php | 2 | ||||
| -rwxr-xr-x | mod/match.php | 2 | ||||
| -rwxr-xr-x | mod/notifications.php | 4 | ||||
| -rwxr-xr-x | mod/suggest.php | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/mod/dirfind.php b/mod/dirfind.php index 75b1c4976..34c54dd91 100755 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -46,7 +46,7 @@ function dirfind_content(&$a) { foreach($j->results as $jj) { $o .= replace_macros($tpl,array( - '$url' => $jj->url, + '$url' => zrl($jj->url), '$name' => $jj->name, '$photo' => $jj->photo, '$tags' => $jj->tags diff --git a/mod/match.php b/mod/match.php index 1ae7848a6..926df1dff 100755 --- a/mod/match.php +++ b/mod/match.php @@ -51,7 +51,7 @@ function match_content(&$a) { $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; $o .= replace_macros($tpl,array( - '$url' => $jj->url, + '$url' => zrl($jj->url), '$name' => $jj->name, '$photo' => $jj->photo, '$inttxt' => ' ' . t('is interested in:'), diff --git a/mod/notifications.php b/mod/notifications.php index ff131010f..551b307db 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -145,7 +145,7 @@ function notifications_content(&$a) { '$contact_id' => $rr['contact-id'], '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"), '$fullname' => $rr['fname'], - '$url' => $rr['furl'], + '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), @@ -195,7 +195,7 @@ function notifications_content(&$a) { '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), - '$url' => $rr['url'], + '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), '$note' => $rr['note'], diff --git a/mod/suggest.php b/mod/suggest.php index b8ca423c5..7a86d53a1 100755 --- a/mod/suggest.php +++ b/mod/suggest.php @@ -52,7 +52,7 @@ function suggest_content(&$a) { $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); $o .= replace_macros($tpl,array( - '$url' => $rr['url'], + '$url' => zrl($rr['url']), '$name' => $rr['name'], '$photo' => $rr['photo'], '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], |