aboutsummaryrefslogtreecommitdiffstats
path: root/include/identity.php
diff options
context:
space:
mode:
authorjeroenpraat <jeroenpraat@xs4all.nl>2016-03-01 22:09:06 +0100
committerjeroenpraat <jeroenpraat@xs4all.nl>2016-03-01 22:09:06 +0100
commit8b61e546fe488516fa3c5f37df80a68e346b84a9 (patch)
tree8af09fcff55cd613d5d2557a7c0956bd25a4afa3 /include/identity.php
parent7206e8af3a943b0fb286f253ed3abbda2d2572b6 (diff)
parent7808689198601780041e022bf0698e559869f305 (diff)
downloadvolse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.gz
volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.bz2
volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'include/identity.php')
-rw-r--r--include/identity.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php
index 15a4ae8ad..380556246 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -505,8 +505,12 @@ function identity_basic_export($channel_id, $items = false) {
if($r) {
$ret['abook'] = $r;
- foreach($r as $rr)
- $xchans[] = $rr['abook_xchan'];
+ for($x = 0; $x < count($ret['abook']); $x ++) {
+ $xchans[] = $ret['abook'][$x]['abook_chan'];
+ $abconfig = load_abconfig($ret['channel']['channel_hash'],$ret['abook'][$x]['abook_xchan']);
+ if($abconfig)
+ $ret['abook'][$x]['abconfig'] = $abconfig;
+ }
stringify_array_elms($xchans);
}