diff options
| -rw-r--r-- | include/ItemObject.php | 13 | ||||
| -rwxr-xr-x | include/items.php | 4 | ||||
| -rw-r--r-- | mod/tagger.php | 6 |
3 files changed, 16 insertions, 7 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index fc4db3ecf..e057936ae 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -147,6 +147,7 @@ class Item extends BaseObject { $this->check_wall_to_wall(); if($this->is_toplevel()) { + // FIXME check this permission if($conv->get_profile_owner() == local_user()) { // FIXME we don't need all this stuff, some can be done in the template @@ -161,15 +162,19 @@ class Item extends BaseObject { 'starred' => t('starred'), ); - $tagger = array( - 'tagit' => t("add tag"), - 'classtagger' => "", - ); } } else { $indent = 'comment'; } + // FIXME - check this permission + if($conv->get_profile_owner() == local_user()) { + $tagger = array( + 'tagit' => t("add tag"), + 'classtagger' => "", + ); + } + if($this->is_commentable()) { $like = array( t("I like this \x28toggle\x29"), t("like")); $dislike = array( t("I don't like this \x28toggle\x29"), t("dislike")); diff --git a/include/items.php b/include/items.php index 2169dfe37..c4ffcbca6 100755 --- a/include/items.php +++ b/include/items.php @@ -1874,7 +1874,9 @@ function tag_deliver($uid,$item_id) { $j_obj = json_decode($item['object'],true); logger('tag_deliver: tag object: ' . print_r($j_obj,true), LOGGER_DATA); if($j_obj && $j_obj['id'] && $j_obj['title']) { - store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j['obj']['id']); + if(is_array($j_obj['link'])) + $taglink = get_rel_link($j_obj['link'],'alternate'); + store_item_tag($u[0]['channel_id'],$p[0]['id'],TERM_OBJ_POST,TERM_HASHTAG,$j_obj['title'],$j_obj['id']); proc_run('php','include/notifier.php','edit_post',$p[0]['id']); } } diff --git a/mod/tagger.php b/mod/tagger.php index 6ad026f62..ec5c92184 100644 --- a/mod/tagger.php +++ b/mod/tagger.php @@ -11,6 +11,8 @@ function tagger_content(&$a) { return; } + $observer_hash = get_observer_hash(); + $term = notags(trim($_GET['term'])); // no commas allowed $term = str_replace(array(',',' '),array('','_'),$term); @@ -121,8 +123,8 @@ function tagger_content(&$a) { $arr['obj_type'] = $objtype; $arr['object'] = $obj; $arr['parent_mid'] = $item['mid']; - - store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_HASHTAG,$term); + + store_item_tag($item['uid'],$item['id'],TERM_OBJ_POST,TERM_HASHTAG,$term,$tagid); $ret = post_activity_item($arr); if($ret['success']) |