Changeset 15907 for trunk/inc

Timestamp:

01/23/12 17:53:24 (4 months ago)

Author:

Alexander Trofimov

Message:

Forms, Menus - some fixes

Location:

trunk/inc/classes

Files:

• BxDolForm.php (modified) (1 diff)
• BxDolMenu.php (modified) (2 diffs)

trunk/inc/classes/BxDolForm.php

@@ -969 +969 @@
      */ 
     protected function _isVisible ($aInput) {
-        bx_import('BxDolAcl');
-        echo $aInput['name'] . ' - ' . BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']) . '<br />';
+        bx_import('BxDolAcl');        
         return BxDolAcl::getInstance()->isMemberLevelInSet($aInput['visible_for_levels']);
     }

trunk/inc/classes/BxDolMenu.php

@@ -103 +103 @@
         parent::__construct();
 
-        $this->_sObject = $aObject['object'];
+        $this->_sObject = isset($aObject['object']) ? $aObject['object'] : 'bx-menu-obj-' . time() . rand(0, PHP_INT_MAX);
         $this->_aObject = $aObject;
         $this->_oQuery = new BxDolMenuQuery($this->_aObject);
@@ -166 +166 @@
      */ 
     protected function _isSelected ($a) {
-        return $a['module'] == self::$SEL_MODULE && $a['name'] == self::$SEL_NAME ? true : false;
+        return (!isset($a['module']) || $a['module'] == self::$SEL_MODULE) && $a['name'] == self::$SEL_NAME ? true : false;
     }