Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolProfile.php

@@ -554,7 +554,7 @@ class BxDolProfile extends BxDolFactory implements iBxDolProfile
         $this->_aProfile = array();
 
         // alert about status changing
-        bx_alert('profile', $sAlertActionName, $iProfileId, false, array('action' => $iAction));
+        bx_alert('profile', $sAlertActionName, $iProfileId, false, array('action' => $iAction, 'status' => &$sStatus, 'send_email_notification' => &$bSendEmailNotification));
         
         $this->doAudit('_sys_audit_action_set_status_' . $sStatus);
         

template/scripts/BxBaseMenuSubmenu.php

@@ -36,6 +36,15 @@ class BxBaseMenuSubmenu extends BxTemplMenu
         $this->_iContentId = $iContentId;
     }
 
+    /**
+     * Get current menu in submenu
+     * @return menu object name
+     */
+    public function getObjectSubmenu()
+    {        
+        return $this->_sObjectSubmenu;
+    }
+    
     /**
      * Set current menu object in submenu
      * @param $sMenuObject menu object name