Index: branches/5.1.x/core/units/helpers/menu_helper.php
===================================================================
diff -u -N -r13168 -r13545
--- branches/5.1.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 13168)
+++ branches/5.1.x/core/units/helpers/menu_helper.php	(.../menu_helper.php)	(revision 13545)
@@ -276,13 +276,12 @@
 			static $lang_part = null;
 
 			if (!isset($lang_part)) {
-				$sql = 'SELECT COUNT(*)
-						FROM ' . TABLE_PREFIX . 'Language';
-				$languages_count = ceil($this->Conn->GetOne($sql) / 5) * 5;
+				$ml_helper =& $this->Application->recallObject('kMultiLanguageHelper');
+				/* @var $ml_helper kMultiLanguageHelper */
 
 				$lang_part = '';
 
-				for ($i = 1; $i <= $languages_count; $i++) {
+				for ($i = 1; $i <= $ml_helper->languageCount; $i++) {
 					$lang_part .= 'c.l' . $i . '_MenuTitle AS l' . $i . '_ItemName,' . "\n";
 				}
 			}