harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	include/identity.php
This commit is contained in:
redmatrix 2015-09-08 17:53:43 -07:00
commit b28d3015fe
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/identity.php
View File

@ -7,7 +7,6 @@ require_once('include/zot.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/menu.php'); require_once('include/menu.php');
/** /**
* @brief Called when creating a new channel. * @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) if(! $items)
return $ret; return $ret;

2
version.inc
View File

@ -1 +1 @@
2015-09-07.1148 2015-09-08.1149