diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2013-10-11 00:24:25 -0700 |
| commit | 7a63d5e50b0ae16a38e673867abd6043d4becc07 (patch) | |
| tree | 6d174d12a0de707ed8f875801a8dbc0c35f70d3f /include/activities.php | |
| parent | c2a88c3e4858e3eb2c553bdc775d2f684b0d46b4 (diff) | |
| parent | 89fc319c900873be58fa677707518646f6c79eec (diff) | |
| download | volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.gz volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.tar.bz2 volse-hubzilla-7a63d5e50b0ae16a38e673867abd6043d4becc07.zip | |
Merge pull request #2 from friendica/master
Upgraded to latest red
Diffstat (limited to 'include/activities.php')
| -rw-r--r-- | include/activities.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/activities.php b/include/activities.php index 10a01792f..73180eae0 100644 --- a/include/activities.php +++ b/include/activities.php @@ -45,6 +45,8 @@ function profile_activity($changed, $value) { $prof = '[url=' . z_root() . '/profile/' . $self['channel_address'] . ']' . t('public profile') . '[/url]'; if($t == 1 && strlen($value)) { + // if it's a url, the HTML quotes will mess it up, so link it and don't try and zidify it because we don't know what it points to. + $value = linkify($value); $message = sprintf( t('%1$s changed %2$s to “%3$s”'), $A, $changes, $value); $message .= "\n\n" . sprintf( t('Visit %1$s\'s %2$s'), $A, $prof); } @@ -73,7 +75,8 @@ function profile_activity($changed, $value) { $arr['deny_cid'] = $self['channel_deny_cid']; $arr['deny_gid'] = $self['channel_deny_gid']; - $i = item_store($arr); + $res = item_store($arr); + $i = $res['item_id']; if($i) { // FIXME - limit delivery in notifier.php to those specificed in the perms argument |