diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-28 19:06:31 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-28 19:06:31 -0700 |
| commit | 8fe3daab21f9aba00f7def3553247b0cbcf5f94a (patch) | |
| tree | 3e8b22ef3b197e4dbdba3e86f7427452d1cd6b73 /mod | |
| parent | b381ec57346a6d7724b2317c120ce2e6e70edc37 (diff) | |
| parent | df5223fe9813a2f6bee053c1c3c6acbdbaf6d42f (diff) | |
| download | volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.gz volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.tar.bz2 volse-hubzilla-8fe3daab21f9aba00f7def3553247b0cbcf5f94a.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
install/schema_mysql.sql
mod/impel.php
view/pt-br/messages.po
view/pt-br/strings.php
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/impel.php | 1 | ||||
| -rw-r--r-- | mod/menu.php | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mod/impel.php b/mod/impel.php index 636ef8554..711547624 100644 --- a/mod/impel.php +++ b/mod/impel.php @@ -113,6 +113,7 @@ function impel_init(&$a) { dbesc($namespace), intval(local_channel()) ); + $i = q("select id, edited, item_deleted from item where mid = '%s' and uid = %d limit 1", dbesc($arr['mid']), intval(local_channel()) diff --git a/mod/menu.php b/mod/menu.php index 0dbbfde9c..63aeaa5e3 100644 --- a/mod/menu.php +++ b/mod/menu.php @@ -78,6 +78,9 @@ function menu_content(&$a) { $x = menu_list($uid); if($x) { for($y = 0; $y < count($x); $y ++) { + $m = menu_fetch($x[$y]['menu_name'],$uid,get_observer_hash()); + if($m) + $x[$y]['element'] = '[element]' . base64url_encode(json_encode(menu_element($m))) . '[/element]'; $x[$y]['bookmark'] = (($x[$y]['menu_flags'] & MENU_BOOKMARK) ? true : false); } } |