clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/friendica/friendica

This commit is contained in:
Tobias Diekershoff 2012-03-30 08:12:28 +02:00
parent e2370b56bf d83bfd464b
commit d22b3a1d9c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/dirfind.php
View File

@ -46,7 +46,7 @@ function dirfind_content(&$a) {
foreach($j->results as $jj) { foreach($j->results as $jj) {
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => $jj->url, '$url' => zrl($jj->url),
'$name' => $jj->name, '$name' => $jj->name,
'$photo' => $jj->photo, '$photo' => $jj->photo,
'$tags' => $jj->tags '$tags' => $jj->tags

2
mod/match.php
View File

@ -51,7 +51,7 @@ function match_content(&$a) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url; $connlnk = $a->get_baseurl() . '/follow/?url=' . $jj->url;
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => $jj->url, '$url' => zrl($jj->url),
'$name' => $jj->name, '$name' => $jj->name,
'$photo' => $jj->photo, '$photo' => $jj->photo,
'$inttxt' => ' ' . t('is interested in:'), '$inttxt' => ' ' . t('is interested in:'),

4
mod/notifications.php
View File

@ -145,7 +145,7 @@ function notifications_content(&$a) {
'$contact_id' => $rr['contact-id'], '$contact_id' => $rr['contact-id'],
'$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"), '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
'$fullname' => $rr['fname'], '$fullname' => $rr['fname'],
'$url' => $rr['furl'], '$url' => zrl($rr['furl']),
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$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')), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
@ -195,7 +195,7 @@ function notifications_content(&$a) {
'$fullname' => $rr['name'], '$fullname' => $rr['name'],
'$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$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')), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')),
'$url' => $rr['url'], '$url' => zrl($rr['url']),
'$knowyou' => $knowyou, '$knowyou' => $knowyou,
'$approve' => t('Approve'), '$approve' => t('Approve'),
'$note' => $rr['note'], '$note' => $rr['note'],

2
mod/suggest.php
View File

@ -52,7 +52,7 @@ function suggest_content(&$a) {
$connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']); $connlnk = $a->get_baseurl() . '/follow/?url=' . (($rr['connect']) ? $rr['connect'] : $rr['url']);
$o .= replace_macros($tpl,array( $o .= replace_macros($tpl,array(
'$url' => $rr['url'], '$url' => zrl($rr['url']),
'$name' => $rr['name'], '$name' => $rr['name'],
'$photo' => $rr['photo'], '$photo' => $rr['photo'],
'$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'], '$ignlnk' => $a->get_baseurl() . '/suggest?ignore=' . $rr['id'],