diff options
| -rw-r--r-- | include/bookmarks.php | 2 | ||||
| -rw-r--r-- | mod/bookmarks.php | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/bookmarks.php b/include/bookmarks.php index 7a9f40697..99cb60e64 100644 --- a/include/bookmarks.php +++ b/include/bookmarks.php @@ -48,7 +48,7 @@ function bookmark_add($channel,$sender,$taxonomy,$private) { intval($channel_id) ); if($r) - logger('duplicate menu entry'); + logger('add_bookmark: duplicate menu entry', LOGGER_DEBUG); if(! $r) $r = menu_add_item($menu_id,$channel_id,$iarr); return $r; diff --git a/mod/bookmarks.php b/mod/bookmarks.php index 73958ff2f..de30d9bb6 100644 --- a/mod/bookmarks.php +++ b/mod/bookmarks.php @@ -8,11 +8,12 @@ function bookmarks_init(&$a) { return; $u = $a->get_channel(); - + $i = q("select * from item where id = %d and uid = %d limit 1", intval($item_id), intval(local_user()) ); + if(! $i) return; @@ -22,16 +23,18 @@ function bookmarks_init(&$a) { $terms = get_terms_oftype($item['term'],TERM_BOOKMARK); - if($terms && (! $i[0]['item_restrict'])) { + if($terms && (! $item['item_restrict'])) { require_once('include/bookmarks.php'); - require_once('include/Contact.php'); - $s = channelx_by_hash($i[0]['author_xchan']); + + $s = q("select * from xchan where xchan_hash = '%s' limit 1", + dbesc($item['author_xchan']) + ); if(! $s) { - notice( t('Author lookup failed') . EOL); + logger('mod_bookmarks: author lookup failed.'); killme(); } foreach($terms as $t) { - bookmark_add($u,$s[0],$t,$i[0]['item_private']); + bookmark_add($u,$s[0],$t,$item['item_private']); notice( t('Bookmark added') . EOL); } } |