Ticket #3657 - Check 'Page Type' visibility in Custom menus.

inc/classes/BxDolMenu.php

@@ -333,12 +333,15 @@ class BxDolMenu extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
      */
     protected function _isVisible ($a)
     {
-        if (!BxDolAcl::getInstance()->isMemberLevelInSet($a['visible_for_levels']))
+        if(isset($a['visible_for_levels']) && !BxDolAcl::getInstance()->isMemberLevelInSet($a['visible_for_levels']))
+            return false;
+
+        if(!empty($a['visibility_custom']) && !BxDolService::callSerialized($a['visibility_custom'], $this->_aMarkers))
+            return false;
+
+        if($this->_iPageType && !empty($a['hidden_on_pt']) && ((1 << ($this->_iPageType - 2)) & (int)$a['hidden_on_pt']))
             return false;
 
-        if (!empty($a['visibility_custom']))
-            return BxDolService::callSerialized($a['visibility_custom'], $this->_aMarkers);
-        
         return true;
     }
     

template/scripts/BxBaseMenu.php

@@ -153,10 +153,7 @@ class BxBaseMenu extends BxDolMenu
         if (isset($a['active']) && !$a['active'])
             return false;
 
-        if (isset($a['visible_for_levels']) && !$this->_isVisible($a))
-            return false;
-
-        if($this->_iPageType && !empty($a['hidden_on_pt']) && ((1 << ($this->_iPageType - 2)) & (int)$a['hidden_on_pt']))
+        if (!$this->_isVisible($a))
             return false;
 
         $a['title'] = _t($a['title']);

template/scripts/BxBaseMenuCustom.php

@@ -69,7 +69,7 @@ class BxBaseMenuCustom extends BxTemplMenuMoreAuto
     	if (isset($aItem['active']) && !$aItem['active'])
             return false;
 
-        if (isset($aItem['visible_for_levels']) && !$this->_isVisible($aItem))
+        if (!$this->_isVisible($aItem))
             return false;
 
     	$sMethod = '_getMenuItem' . str_replace(' ', '', ucwords(str_replace('-', ' ', $aItem['name'])));