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

modules/base/profile/classes/BxBaseModProfileModule.php

@@ -2101,8 +2101,8 @@ class BxBaseModProfileModule extends BxBaseModGeneralModule implements iBxDolCon
 
         if(getParam('sys_api_conn_in_prof_units') == 'on' && ($oProfile = BxDolProfile::getInstanceByContentAndType($aData[$CNF['FIELD_ID']], $sModule)) !== false) {
             $iProfileId = $oProfile->id();
-
-            if(($oConnection = BxDolConnection::getObjectInstance('sys_profiles_friends')) !== false) {
+            $aResult['title'] = $oProfile->getDisplayName();
+            if(($oConnection = BxDolConnection::getObjectInstance('sys_profiles_friends')) !== false && isset($CNF['URI_VIEW_FRIENDS'])) {
                 $aResult['friends_count'] = $oConnection->getConnectedContentCount($iProfileId, true);
                 $aResult['friends_list'] = $oConnection->getConnectedListAPI($iProfileId, true, BX_CONNECTIONS_CONTENT_TYPE_CONTENT);
                 if(isLogged()) {

modules/boonex/ads/classes/BxAdsFormsEntryHelper.php

@@ -48,9 +48,11 @@ class BxAdsFormsEntryHelper extends BxBaseModTextFormsEntryHelper
         $oForm->initChecker($aContentInfo);
 
         if(!empty($CNF['FIELD_TEXT']) &&  !$oForm->isInputVisible($CNF['FIELD_TEXT']))
-            return '';
-
-        return $this->_oModule->_oTemplate->entryText($aContentInfo);
+            $s = '';
+        else
+            $s = $this->_oModule->_oTemplate->entryText($aContentInfo);
+        
+        return bx_is_api() ? [bx_api_get_block('entity_text', $s)] : $s;
     }
 
     public function onDataAddAfter($iAccountId, $iContentId)

modules/boonex/ads/classes/BxAdsModule.php

@@ -422,6 +422,10 @@ class BxAdsModule extends BxBaseModTextModule
 
             $sParams['display'] = $sDisplay;
         }
+        
+        if (is_int($sParams)){
+            $_GET['category'] = $sParams;
+        }
 
         return parent::serviceEntityCreate($sParams);
     }