diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-17 19:49:36 -0700 |
commit | 7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00 (patch) | |
tree | d88838524fa5f6cbf1d072da73eddafd4b752ffb /mod/mitem.php | |
parent | f0cb3cba124e637fa46143b692dbb561d4ee3ae0 (diff) | |
parent | 76558df9667b4900b4036faca0075985596b93cd (diff) | |
download | volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.gz volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.tar.bz2 volse-hubzilla-7c7a5cba8fe6fd6dc15acc14954d9ba9ed632c00.zip |
Merge branch 'master' into tres
Diffstat (limited to 'mod/mitem.php')
-rw-r--r-- | mod/mitem.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/mitem.php b/mod/mitem.php index 9a80ba88b..0961e15ff 100644 --- a/mod/mitem.php +++ b/mod/mitem.php @@ -159,7 +159,7 @@ function mitem_content(&$a) { '$permdesc' => t("\x28click to open/close\x29"), '$aclselect' => populate_acl($perm_defaults,false), '$mitem_desc' => array('mitem_desc', t('Link Name'), '', 'Visible name of the link','*'), - '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), + '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), '', t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-names"'), '$usezid' => array('usezid', t('Use magic-auth if available'), true, ''), '$newwin' => array('newwin', t('Open link in new window'), false,''), '$mitem_order' => array('mitem_order', t('Order in list'),'0',t('Higher numbers will sink to bottom of listing')), @@ -230,8 +230,8 @@ function mitem_content(&$a) { '$aclselect' => populate_acl($mitem,false), '$mitem_id' => intval(argv(2)), '$mitem_desc' => array('mitem_desc', t('Link text'), $mitem['mitem_desc'], '','*'), - '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], t('Enter URL of the link or select a menu name to create a submenu'), '*', 'list="menu-name"'), - '$usezid' => array('usezid', t('Use Hubzilla magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), + '$mitem_link' => array('mitem_link', t('Link or Submenu Target'), $mitem['mitem_link'], 'Enter URL of the link or select a menu name to create a submenu', '*', 'list="menu-names"'), + '$usezid' => array('usezid', t('Use magic-auth if available'), (($mitem['mitem_flags'] & MENU_ITEM_ZID) ? 1 : 0), ''), '$newwin' => array('newwin', t('Open link in new window'), (($mitem['mitem_flags'] & MENU_ITEM_NEWWIN) ? 1 : 0),''), '$mitem_order' => array('mitem_order', t('Order in list'),$mitem['mitem_order'],t('Higher numbers will sink to bottom of listing')), '$submit' => t('Submit'), |