diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/rbmark.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/rbmark.php')
| -rw-r--r-- | mod/rbmark.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/rbmark.php b/mod/rbmark.php index 4401e3626..979f96f85 100644 --- a/mod/rbmark.php +++ b/mod/rbmark.php @@ -1,6 +1,6 @@ <?php /** @file */ -require_once('acl_selectors.php'); +require_once('include/acl_selectors.php'); require_once('include/crypto.php'); require_once('include/items.php'); require_once('include/taxonomy.php'); @@ -30,7 +30,7 @@ function rbmark_post(&$a) { logger('rbmark_post: ' . print_r($_REQUEST,true)); - $channel = $a->get_channel(); + $channel = App::get_channel(); $t = array('url' => escape_tags($_REQUEST['url']),'term' => escape_tags($_REQUEST['title'])); bookmark_add($channel,$channel,$t,((x($_REQUEST,'private')) ? intval($_REQUEST['private']) : 0), @@ -75,7 +75,7 @@ function rbmark_content(&$a) { goaway(z_root() . '/bookmarks'); } - $channel = $a->get_channel(); + $channel = App::get_channel(); $m = menu_list($channel['channel_id'],'',MENU_BOOKMARK); |