From 2e72b136c558652ca9a9b755b29cdb99ee27ee7f Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 26 Aug 2013 17:48:05 -0700 Subject: fix profile change activity where the change is a solitary url - and includes a stray right quote --- include/activities.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/activities.php') diff --git a/include/activities.php b/include/activities.php index 10a01792f..7ef26abeb 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); } -- cgit v1.2.3 From 3e5414cf35f3781297490e058c6d366bca45748e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 10 Sep 2013 19:06:06 -0700 Subject: provide detailed error to remote site for the myriad of things that can go wrong inside item_store(), !! this changes the return of item_store !! --- include/activities.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/activities.php') diff --git a/include/activities.php b/include/activities.php index 7ef26abeb..73180eae0 100644 --- a/include/activities.php +++ b/include/activities.php @@ -75,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 -- cgit v1.2.3