Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php

2 files changed, 20 insertions, 2 deletions

diff --git a/include/diaspora.php b/include/diaspora.php
index acdddd0ef..c9efffc32 100755
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -2430,7 +2430,7 @@ function diaspora_send_status($item,$owner,$contact,$public_batch = false) {
 	if($item['item_flags'] & ITEM_CONSENSUS) {
 		$poll = replace_macros(get_markup_template('diaspora_consensus.tpl'), array(
 			'$guid_q' => random_string(),
-			'$question' => '',
+			'$question' => t('Please choose'),
 			'$guid_y' => random_string(),
 			'$agree' => t('Agree'),
 			'$guid_n' => random_string(),
diff --git a/include/menu.php b/include/menu.php
index a2e91f7ed..5c0811437 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -29,17 +29,33 @@ function menu_render($menu, $class='', $edit = false, $var = '') {
 	if(! $menu)
 		return '';
 
+	$channel_id = ((is_array(get_app()->profile)) ? get_app()->profile['profile_uid'] : 0);
+	$menu_list = menu_list($channel_id);
+
+	foreach($menu_list as $menus) {
+		if($menus['menu_name'] != $menu['menu']['menu_name'])
+			$menu_names[] = $menus['menu_name'];
+	}
+
 	for($x = 0; $x < count($menu['items']); $x ++) {
+		if(in_array($menu['items'][$x]['mitem_link'], $menu_names)) {
+			$m = menu_fetch($menu['items'][$x]['mitem_link'], $channel_id, get_observer_hash());
+			$submenu = menu_render($m, 'dropdown-menu', $edit = false, $var = array('wrap' => 'none'));
+			$menu['items'][$x]['submenu'] = $submenu;
+		}
+
 		if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_ZID)
 			$menu['items'][$x]['mitem_link'] = zid($menu['items'][$x]['mitem_link']);
+
 		if($menu['items'][$x]['mitem_flags'] & MENU_ITEM_NEWWIN)
 			$menu['items'][$x]['newwin'] = '1';
+
 		$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
 	}
 
 	$wrap = (($var['wrap'] === 'none') ? false : true);
 
-	return replace_macros(get_markup_template('usermenu.tpl'),array(
+	$ret = replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
 		'$class' => $class,
 		'$edit' => (($edit) ? t("Edit") : ''),
@@ -47,6 +63,8 @@ function menu_render($menu, $class='', $edit = false, $var = '') {
 		'$items' => $menu['items'],
 		'$wrap' => $wrap
 	));
+
+	return $ret;
 }