Index: branches/5.2.x/core/units/helpers/menu_helper.php
===================================================================
diff -u -N -r14092 -r14095
--- branches/5.2.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 14092)
+++ branches/5.2.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 14095)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: menu_helper.php 12951 2009-12-19 10:04:11Z alex $
+* @version	$Id: menu_helper.php 14095 2010-12-28 17:37:07Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -82,7 +82,7 @@
 			$block_params['total_items'] = count($cur_menu);
 
 			foreach ($cur_menu as $page) {
-				$block_params = array_merge_recursive2(
+				$block_params = array_merge(
 					$block_params,
 					$this->_prepareMenuItem($page, $real_cat_id, $root_path)
 				);
@@ -148,8 +148,7 @@
 						$this->Application->setCache('master:cms_menu', serialize($menu));
 					}
 					else {
-						$to_cache = serialize($menu); // setDBCache's 2nd parameter passed by reference!
-						$this->Application->setDBCache('cms_menu', $to_cache);
+						$this->Application->setDBCache('cms_menu', serialize($menu));
 					}
 				}
 
@@ -281,9 +280,10 @@
 				/* @var $ml_helper kMultiLanguageHelper */
 
 				$lang_part = '';
+				$languages = $ml_helper->getLanguages();
 
-				for ($i = 1; $i <= $ml_helper->languageCount; $i++) {
-					$lang_part .= 'c.l' . $i . '_MenuTitle AS l' . $i . '_ItemName,' . "\n";
+				foreach ($languages as $language_id) {
+					$lang_part .= 'c.l' . $language_id . '_MenuTitle AS l' . $language_id . '_ItemName,' . "\n";
 				}
 			}
 
@@ -329,9 +329,10 @@
 
 				$lang_part = '';
 				$items_by_parent = Array ();
+				$languages = $ml_helper->getLanguages();
 
-				for ($i = 1; $i <= $ml_helper->languageCount; $i++) {
-					$lang_part .= 'c.l' . $i . '_MenuTitle AS l' . $i . '_ItemName,' . "\n";
+				foreach ($languages as $language_id) {
+					$lang_part .= 'c.l' . $language_id . '_MenuTitle AS l' . $language_id . '_ItemName,' . "\n";
 				}
 
 				// Sub-categories from current category