diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-01 07:21:17 +0200 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-01 07:21:17 +0200 |
| commit | 4fe3b5c6a62987189f4d29fba78c71f7df42791c (patch) | |
| tree | 89f53893011a8d623d685067cbc52449e25926da /include/identity.php | |
| parent | 1b82fb7349a7a4048755d92e757efc5dc227b227 (diff) | |
| parent | 417da13353431ddadafe661803115cf9dd9bf9ca (diff) | |
| download | volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.tar.gz volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.tar.bz2 volse-hubzilla-4fe3b5c6a62987189f4d29fba78c71f7df42791c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/identity.php')
| -rw-r--r-- | include/identity.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php index 871d85700..d822dc69c 100644 --- a/include/identity.php +++ b/include/identity.php @@ -427,7 +427,7 @@ function create_identity($arr) { } } - call_hooks('register_account', $newuid); + call_hooks('create_identity', $newuid); proc_run('php','include/directory.php', $ret['channel']['channel_id']); } @@ -565,7 +565,8 @@ function identity_basic_export($channel_id, $items = false) { if(! $items) return $ret; - $r = q("select likes.*, item.mid from likes left join item on likes.iid = item.id where likes.channel_id = %d", + + $r = q("select * from likes where channel_id = %d", intval($channel_id) ); |