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

install/sql/system.sql

@@ -502,7 +502,7 @@ INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `ex
 
 (@iCategoryId, 'sys_hide_post_to_context_for_privacy', '_adm_stg_cpt_option_sys_hide_post_to_context_for_privacy', '', 'list', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:44:"get_options_module_list_for_privacy_selector";s:5:"class";s:13:"TemplServices";}', '', '', 50),
 
-(@iCategoryId, 'sys_vote_reactions_quick_mode', '_adm_stg_cpt_option_sys_vote_reactions_quick_mode', '', 'checkbox', '', '', '', 60);
+(@iCategoryId, 'sys_vote_reactions_quick_mode', '_adm_stg_cpt_option_sys_vote_reactions_quick_mode', 'on', 'checkbox', '', '', '', 60);
 
 --
 -- CATEGORY: Storage

modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -117,11 +117,11 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
 
     protected function _getActionDelete($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
     {
-		if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && !$this->_oModule->_isAdministrator())
-			return '';
+        if($this->_sManageType == BX_DOL_MANAGE_TOOLS_ADMINISTRATION && !$this->_oModule->_isAdministrator())
+            return '';
 
         $CNF = &$this->_oModule->_oConfig->CNF;
-        if (isset($aRow[$CNF['FIELD_ID']])){
+        if(isset($CNF['FIELD_ID']) && isset($aRow[$CNF['FIELD_ID']])){
             $aContentInfo = $this->_getContentInfo($aRow[$CNF['FIELD_ID']]);
             if($this->_oModule->checkAllowedDelete($aContentInfo) !== CHECK_ACTION_RESULT_ALLOWED)
                 return '';

studio/template/scripts/BxBaseStudioNavigationItems.php

@@ -30,7 +30,7 @@ class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems
         if(!$oGrid)
             return '';
 
-        $sContent = BxTemplFunctions::getInstance()->popupBox('adm-nav-item-import-popup', _t('_adm_nav_txt_items_import_popup'), $this->_oTemplate->parseHtmlByName('nav_import_item.html', array(
+        $sContent = BxTemplStudioFunctions::getInstance()->popupBox('adm-nav-item-import-popup', _t('_adm_nav_txt_items_import_popup'), $this->_oTemplate->parseHtmlByName('nav_import_item.html', array(
             'grid' => $oGrid->getCode()
         )));