Project

General

Profile

Feature #17860 » 6853-fixedItemStateForShortcuts.diff

Administrator Admin, 2009-05-30 19:03

View differences:

typo3/sysext/cms/tslib/class.tslib_menu.php (working copy)
*/
function isItemState($kind,$key) {
$natVal=0;
$uid = $this->resolveLinkUid($key);
if ($this->menuArr[$key]['ITEM_STATE']) { // If any value is set for ITEM_STATE the normal evaluation is discarded
if (!strcmp($this->menuArr[$key]['ITEM_STATE'],$kind)) {$natVal=1;}
} else {
......
$natVal = $this->menuArr[$key]['isSpacer'];
break;
case 'IFSUB':
$natVal = $this->isSubMenu($this->menuArr[$key]['uid']);
$natVal = $this->isSubMenu($uid);
break;
case 'ACT':
$natVal = $this->isActive($this->menuArr[$key]['uid'], $this->getMPvar($key));
$natVal = $this->isActive($uid, $this->getMPvar($key));
break;
case 'ACTIFSUB':
$natVal = $this->isActive($this->menuArr[$key]['uid'], $this->getMPvar($key)) && $this->isSubMenu($this->menuArr[$key]['uid']);
$natVal = $this->isActive($uid, $this->getMPvar($key)) && $this->isSubMenu($uid);
break;
case 'CUR':
$natVal = $this->isCurrent($this->menuArr[$key]['uid'], $this->getMPvar($key));
$natVal = $this->isCurrent($uid, $this->getMPvar($key));
break;
case 'CURIFSUB':
$natVal = $this->isCurrent($this->menuArr[$key]['uid'], $this->getMPvar($key)) && $this->isSubMenu($this->menuArr[$key]['uid']);
$natVal = $this->isCurrent($uid, $this->getMPvar($key)) && $this->isSubMenu($uid);
break;
case 'USR':
$natVal = $this->menuArr[$key]['fe_group'];
......
}
/**
* Resolves the final link uid of the given page id, if page of given ID is of type shortcut
*
* @param integer uid of the page.
* @return integer Returns the uid of the linked page
* @access private
*/
function resolveLinkUid($key) {
$page = &$this->menuArr[$key];
if ($page['doktype'] == 4) {
$shortcutPage = $GLOBALS['TSFE']->getPageShortcut($page['shortcut'],$page['shortcut_mode'],$page['uid']);
if (is_array($shortcutPage) && $shortcutPage['uid']) {
return $shortcutPage['uid'];
}
}
return $page['uid'];
}
/**
* Creates an access-key for a TMENU/GMENU menu item based on the menu item titles first letter
*
* @param string Menu item title.
(1-1/2)