From 6959c9e42350b7d19402bef24bb4fd366af22ed4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 10 Jun 2018 15:27:55 -0700
Subject: fixes for immediate expire, channel_active not initialised in DB

---
 include/channel.php | 1 +
 include/items.php   | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index 1a62dcd3c..d26056171 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -2359,6 +2359,7 @@ function channel_store_lowlevel($arr) {
 		'channel_dirdate'         => ((array_key_exists('channel_dirdate',$arr))         ? $arr['channel_dirdate']         : NULL_DATE),
 		'channel_lastpost'        => ((array_key_exists('channel_lastpost',$arr))        ? $arr['channel_lastpost']        : NULL_DATE),
 		'channel_deleted'         => ((array_key_exists('channel_deleted',$arr))         ? $arr['channel_deleted']         : NULL_DATE),
+		'channel_active'          => ((array_key_exists('channel_active',$arr))          ? $arr['channel_active']          : NULL_DATE),
 		'channel_max_anon_mail'   => ((array_key_exists('channel_max_anon_mail',$arr))   ? $arr['channel_max_anon_mail']   : '10'),
 		'channel_max_friend_req'  => ((array_key_exists('channel_max_friend_req',$arr))  ? $arr['channel_max_friend_req']  : '10'),
 		'channel_expire_days'     => ((array_key_exists('channel_expire_days',$arr))     ? $arr['channel_expire_days']     : '0'),
diff --git a/include/items.php b/include/items.php
index e75a9659d..54df5d322 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3697,10 +3697,7 @@ function delete_item_lowlevel($item, $stage = DROPITEM_NORMAL, $force = false) {
 				);
 			}
 			else {
-				$r = q("UPDATE item SET item_deleted = 1, body = '', title = '',
-					changed = '%s', edited = '%s'  WHERE id = %d",
-					dbesc(datetime_convert()),
-					dbesc(datetime_convert()),
+				$r = q("DELETE FROM item WHERE id = %d",
 					intval($item['id'])
 				);
 			}
-- 
cgit v1.2.3


From 912ccb31a133c09b28890f0bab5be5ce1f7f95d4 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Sun, 10 Jun 2018 19:26:35 -0700
Subject: hubzilla core issue #1218

---
 include/menu.php      | 5 +++++
 view/tpl/usermenu.tpl | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/menu.php b/include/menu.php
index 4add78c39..1a2059451 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -81,6 +81,10 @@ function menu_render($menu, $class='', $edit = false, $var = array()) {
 	if ((! $channel_id) && (local_channel()))
 		$channel_id = local_channel();
 
+	$chan = channelx_by_n($channel_id);
+	if(! $chan)
+		return '';
+
 	$menu_list = menu_list($channel_id);
 	$menu_names = array();
 
@@ -110,6 +114,7 @@ function menu_render($menu, $class='', $edit = false, $var = array()) {
 	$ret = replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
 		'$class' => $class,
+		'$nick' => $chan['channel_address'],
 		'$edit' => (($edit) ? t("Edit") : ''),
 		'$id' => $menu['menu']['menu_id'],
 		'$items' => $menu['items'],
diff --git a/view/tpl/usermenu.tpl b/view/tpl/usermenu.tpl
index c51728c34..8bbfedd07 100644
--- a/view/tpl/usermenu.tpl
+++ b/view/tpl/usermenu.tpl
@@ -2,7 +2,7 @@
 <div id="pmenu-{{$id}}" class="pmenu{{if !$class}} widget{{else}} {{$class}}{{/if}}">
 {{/if}}
 	{{if $menu.menu_desc}}
-	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
+	<h3 class="pmenu-title">{{$menu.menu_desc}}{{if $edit}} <a href="mitem/{{$nick}}/{{$menu.menu_id}}" title="{{$edit}}"><i class="fa fa-pencil fakelink" title="{{$edit}}"></i></a>{{/if}}</h3>
 	{{/if}}
 	{{if $items}}
 	<ul class="pmenu-body{{if $wrap || !$class}} nav nav-pills flex-column{{elseif !$wrap || $class}} {{$class}}{{/if}}">
-- 
cgit v1.2.3