Project

General

Profile

Bug #19925 » typo3_10285.patch

Administrator Admin, 2009-01-27 16:25

View differences:

typo3_src/typo3/sysext/cms/tslib/class.tslib_menu.php 2009-01-27 16:07:28.000000000 +0100
$uid = $mount_info['mount_pid'];
}
$recs = $this->sys_page->getMenu($uid,'uid,pid,doktype,mount_pid,mount_pid_ol,nav_hide,shortcut,shortcut_mode');
$recs = $this->sys_page->getMenu(
$uid,
'uid,pid,doktype,mount_pid,mount_pid_ol,nav_hide,shortcut,shortcut_mode,l18n_cfg'
);
foreach($recs as $theRec) {
if (!t3lib_div::inList($this->doktypeExcludeList,$theRec['doktype']) && (!$theRec['nav_hide'] || $this->conf['includeNotInMenu'])) { // If a menu item seems to be another type than 'Not in menu', then return true (there were items!)
return TRUE;
// doktype excluded from the menu?
if (t3lib_div::inList($this->doktypeExcludeList, $theRec['doktype'])) {
continue;
}
// page hidden and the menu isn't forced to show them?
if ($theRec['nav_hide'] && !$this->conf['includeNotInMenu']) {
continue;
}
// default language active and the page excludes the visibility of the default language
if (!$GLOBALS['TSFE']->sys_language_uid && $theRec['l18n_cfg']&1) {
continue;
}
// alternative language active and the page requires a valid page overlay record?
if ($GLOBALS['TSFE']->sys_language_uid && t3lib_div::hideIfNotTranslated($theRec['l18n_cfg']) &&
!$theRec['_PAGES_OVERLAY']) {
continue;
}
return true;
}
return false;
}
/**
(1-1/2)