diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 17:53:43 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-08 17:53:43 -0700 |
| commit | b28d3015fe5d65858736177e306f17543a629fc0 (patch) | |
| tree | e023ca65dfe3fbec34c78b70fd51dfa28d5ba03c | |
| parent | 75d521d42affbafa34e87752deeb1961367de1d5 (diff) | |
| parent | 1ebaacfd5e7e481cbc025842e78161f79f5d7cce (diff) | |
| download | volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.tar.gz volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.tar.bz2 volse-hubzilla-b28d3015fe5d65858736177e306f17543a629fc0.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/identity.php
| -rw-r--r-- | include/identity.php | 11 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/include/identity.php b/include/identity.php index f68b1fe4a..b5235e7ff 100644 --- a/include/identity.php +++ b/include/identity.php @@ -7,7 +7,6 @@ require_once('include/zot.php'); require_once('include/crypto.php'); require_once('include/menu.php'); - /** * @brief Called when creating a new channel. * @@ -607,6 +606,16 @@ function identity_basic_export($channel_id, $items = false) { } } + $x = menu_list($channel_id); + if($x) { + $ret['menu'] = array(); + for($y = 0; $y < count($x); $y ++) { + $m = menu_fetch($x[$y]['menu_name'],$channel_id,$ret['channel']['channel_hash']); + if($m) + $ret['menu'][] = menu_element($m); + } + } + if(! $items) return $ret; diff --git a/version.inc b/version.inc index 89a33f525..5842b45a1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-07.1148 +2015-09-08.1149 |