Pārlūkot izejas kodu

#4558 Build-in API support enhancement (list's validation & embeds fix)

roman.lesnikov@gmail.com 2 gadi atpakaļ
vecāks
revīzija
69c22ce116

+ 1 - 1
inc/classes/BxDolSearch.php

@@ -755,7 +755,7 @@ class BxDolSearchResult implements iBxDolReplaceable
                 return $aItem['id'];
             }, $aData);
 
-            $aData = $aIds == $this->_aParams['validate'] ? 'valid' : 'invalid';
+            $aData = sort($aIds) == sort($this->_aParams['validate']) ? 'valid' : 'invalid';
         }
 
         bx_alert('simple_search', 'get_data', 0, false, [

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

@@ -5366,7 +5366,7 @@ class BxTimelineModule extends BxBaseModNotificationsModule implements iBxDolCon
                     break;
             }
 
-            $aResult = $aIds == $aParams['validate'] ? 'valid' : 'invalid';
+            $aResult = sort($aIds) == sort($aParams['validate']) ? 'valid' : 'invalid';
         }
         else 
             $aResult = $this->_oTemplate->getViewBlock($aParams);

+ 8 - 1
modules/boonex/timeline/classes/BxTimelineTemplate.php

@@ -1959,7 +1959,14 @@ class BxTimelineTemplate extends BxBaseModNotificationsTemplate
                 $sMethodPrepare .= 'BriefCard';
 
             $aEvent['content']['text'] = $this->$sMethodPrepare($aEvent['content']['text'], $aEvent['id']);
-            $aEvent['content']['embed'] = bx_linkify_embeded($aEvent['content']['text']);
+            if (count($aEvent['content']['links']) > 0){
+                bx_import('BxDolEmbed');
+                if(($oEmbed = BxDolEmbed::getObjectInstance('sys_system')) !== false)
+                    $aEvent['content']['embed'] = $oEmbed->getLinkHTML($aEvent['content']['links'][0]['url']);
+
+            }
+            if ($aEvent['content']['embed'] == '')
+                $aEvent['content']['embed'] = bx_linkify_embeded($aEvent['content']['text']);
         }
 
         if(empty($aEventAdd['menu_actions'])) {

+ 1 - 1
template/scripts/BxBaseRecommendation.php

@@ -109,7 +109,7 @@ class BxBaseRecommendation extends BxDolRecommendation
             'per_page' => count($aParams['validate'])
         ]));
 
-        return array_keys($aItems) == $aParams['validate'] ? 'valid' : 'invalid';
+        return sort(array_keys($aItems)) == sort($aParams['validate']) ? 'valid' : 'invalid';
     }
 }