roman.lesnikov@gmail.com 2 лет назад
Родитель
Сommit
f12635d031

+ 0 - 1
install/sql/system.sql

@@ -780,7 +780,6 @@ SET @iCategoryId = LAST_INSERT_ID();
 INSERT INTO `sys_options`(`category_id`, `name`, `caption`, `value`, `type`, `extra`, `check`, `check_error`, `order`) VALUES
 (@iCategoryId, 'sys_api_menu_top', '_adm_stg_cpt_option_sys_api_menu_top', '', 'select', 'a:3:{s:6:"module";s:6:"system";s:6:"method";s:24:"get_options_api_menu_top";s:5:"class";s:13:"TemplServices";}', '', '', 1),
 (@iCategoryId, 'sys_api_comments_flat', '_adm_stg_cpt_option_sys_api_comments_flat', '', 'checkbox', '', '', '', 10),
-(@iCategoryId, 'sys_api_comments_modal', '_adm_stg_cpt_option_sys_api_comments_modal', '', 'checkbox', '', '', '', 15),
 (@iCategoryId, 'sys_api_search_sections', '_adm_stg_cpt_option_sys_api_search_sections', 'bx_posts,bx_persons,bx_groups', 'digit', '', '', '', 20),
 (@iCategoryId, 'sys_api_extended_units', '_adm_stg_cpt_option_sys_api_extended_units', '', 'checkbox', '', '', '', 30),
 (@iCategoryId, 'sys_api_conn_in_prof_units', '_adm_stg_cpt_option_sys_api_conn_in_prof_units', '', 'checkbox', '', '', '', 31);

+ 0 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1752,7 +1752,6 @@
     <string name="_adm_stg_cpt_option_sys_api_cookie_samesite"><![CDATA[Cookies SameSite attribute]]></string>
     <string name="_adm_stg_cpt_option_sys_api_menu_top"><![CDATA[Top Menu]]></string>
     <string name="_adm_stg_cpt_option_sys_api_comments_flat"><![CDATA[Flat comments]]></string>
-    <string name="_adm_stg_cpt_option_sys_api_comments_modal"><![CDATA[Comments in modal]]></string>
     <string name="_adm_stg_cpt_option_sys_api_search_sections"><![CDATA[Search sections]]></string>
     <string name="_adm_stg_cpt_option_sys_api_extended_units"><![CDATA[Use extended units]]></string>
     <string name="_adm_stg_cpt_option_sys_api_conn_in_prof_units"><![CDATA[Use connections lists in profiles/groups units]]></string>

+ 4 - 1
modules/boonex/timeline/classes/BxTimelineModule.php

@@ -982,6 +982,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
             'GetBlockViewHotOutline' => '',
             'GetBlockViewAccount' => '',
             'GetBlockViewAccountOutline' => '',
+            'GetBlockItem' => '',
             'GetPosts' => '',
             'Repost' => '',
             'Delete' => '',
@@ -5366,7 +5367,9 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
                     break;
             }
 
-            $aResult = sort($aIds) == sort($aParams['validate']) ? 'valid' : 'invalid';
+            sort($aIds);
+            sort($aParams['validate']);
+            $aResult = $aIds == $aParams['validate'] ? 'valid' : 'invalid';
         }
         else 
             $aResult = $this->_oTemplate->getViewBlock($aParams);

+ 1 - 1
template/scripts/BxBaseCmtsServices.php

@@ -581,7 +581,7 @@ class BxBaseCmtsServices extends BxDol
             
             // add view (form + new comment)
             if($oForm['form']->isSubmittedAndValid()){
-               $aParams['insert'] = $aParams['order_way'] == 'desc' ? 'after' : 'before';
+               $aParams['insert'] = $aParams['order_way'] == 'desc' ? 'before' : 'after';
                 $aParams['comment_id'] = $oForm['res'];
                 $bIsList = true;
                 $aForm['inputs']['cmt_parent_id']['value'] = 0;