aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-05 03:44:46 -0800
committerfriendica <info@friendica.com>2014-02-05 03:44:46 -0800
commit0844110f7b154a0fb5102362fe732c2b091222d7 (patch)
treed3754aa1d251308eb6178fe4ab138463ceaaf135
parent24f32e55c88311867218c1d93c808cd842453078 (diff)
downloadvolse-hubzilla-0844110f7b154a0fb5102362fe732c2b091222d7.tar.gz
volse-hubzilla-0844110f7b154a0fb5102362fe732c2b091222d7.tar.bz2
volse-hubzilla-0844110f7b154a0fb5102362fe732c2b091222d7.zip
preserve system bit when editing menus
-rw-r--r--mod/menu.php5
-rw-r--r--view/tpl/menuedit.tpl4
2 files changed, 8 insertions, 1 deletions
diff --git a/mod/menu.php b/mod/menu.php
index dd8fe8300..a2d0c2385 100644
--- a/mod/menu.php
+++ b/mod/menu.php
@@ -9,7 +9,9 @@ function menu_post(&$a) {
$_REQUEST['menu_channel_id'] = local_user();
if($_REQUEST['menu_bookmark'])
- $_REQUEST['menu_flags'] = MENU_BOOKMARK;
+ $_REQUEST['menu_flags'] |= MENU_BOOKMARK;
+ if($_REQUEST['menu_system'])
+ $_REQUEST['menu_flags'] |= MENU_SYSTEM;
$menu_id = ((argc() > 1) ? intval(argv(1)) : 0);
if($menu_id) {
@@ -108,6 +110,7 @@ function menu_content(&$a) {
'$menu_name' => array('menu_name', t('Menu name'), $m['menu_name'], t('Must be unique, only seen by you'), '*'),
'$menu_desc' => array('menu_desc', t('Menu title'), $m['menu_desc'], t('Menu title as seen by others'), ''),
'$menu_bookmark' => array('menu_bookmark', t('Allow bookmarks'), (($m['menu_flags'] & MENU_BOOKMARK) ? 1 : 0), t('Menu may be used to store saved bookmarks'), ''),
+ '$menu_system' => (($m['menu_flags'] & MENU_SYSTEM) ? 1 : 0),
'$submit' => t('Modify')
));
return $o;
diff --git a/view/tpl/menuedit.tpl b/view/tpl/menuedit.tpl
index 324dbe426..1ccfb3d68 100644
--- a/view/tpl/menuedit.tpl
+++ b/view/tpl/menuedit.tpl
@@ -10,6 +10,10 @@
{{if $menu_id}}
<input type="hidden" name="menu_id" value="{{$menu_id}}" />
{{/if}}
+{{if $menu_system}}
+<input type="hidden" name="menu_system" value="{{$menu_system}}" />
+{{/if}}
+
{{include file="field_input.tpl" field=$menu_name}}
{{include file="field_input.tpl" field=$menu_desc}}