aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/permissions.php2
-rw-r--r--include/zot.php4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/permissions.php b/include/permissions.php
index bf380cf95..e7f50ceeb 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -23,7 +23,7 @@ function get_perms() {
'post_comments' => array('channel_w_comment', intval(PERMS_W_COMMENT), false, t('Can comment on my posts'), ''),
'post_mail' => array('channel_w_mail', intval(PERMS_W_MAIL), false, t('Can send me private mail messages'), ''),
'post_photos' => array('channel_w_photos', intval(PERMS_W_PHOTOS), false, t('Can post photos to my photo albums'), ''),
- 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post hashtags'), t('Advanced - useful for creating group forum channels')),
+ 'tag_deliver' => array('channel_w_tagwall', intval(PERMS_W_TAGWALL), false, t('Can forward to all my channel contacts via post @mentions'), t('Advanced - useful for creating group forum channels')),
'chat' => array('channel_w_chat', intval(PERMS_W_CHAT), false, t('Can chat with me (when available)'), t('Requires compatible chat plugin')),
'write_storage' => array('channel_w_storage', intval(PERMS_W_STORAGE), false, t('Can write to my "public" file storage'), ''),
'write_pages' => array('channel_w_pages', intval(PERMS_W_PAGES), false, t('Can edit my "public" pages'), ''),
diff --git a/include/zot.php b/include/zot.php
index f7c9bea4c..6dabd76a6 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -947,7 +947,7 @@ function public_recips($msg) {
$x = array();
$r = array_merge($r,$x);
-
+ logger('public_recips: ' . print_r($r,true), LOGGER_DATA);
return $r;
}
@@ -1106,7 +1106,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) {
$arr['aid'] = $channel['channel_account_id'];
$arr['uid'] = $channel['channel_id'];
$item_id = item_store($arr);
- $result[] = array($d['hash'],'posted');
+ $result[] = array($d['hash'],(($item_id) ? 'posted' : 'storage failed'));
}
if($relay && $item_id) {