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

modules/boonex/attendant/classes/BxAttendantModule.php

@@ -191,11 +191,14 @@ class BxAttendantModule extends BxDolModule
         $sRv = '';
         $sDefaultEvent = getParam('bx_attendant_on_profile_event_list');
         $oProfile = BxDolProfile::getInstance($aEvent['profile_id']);
+		print_r($aEvent['profile_id']);
         $oAccount = $oProfile ? $oProfile->getAccountObject() : null;
         $bNeedRaiseEvent = false;
         if ($aEvent['event'] == 'add' && $aEvent['module'] == 'profile'){
             if (getParam('bx_attendant_on_profile_creation_modules') != '' && ($sDefaultEvent == BX_ATTENDANT_ON_PROFILE_CREATION_EVENT_AFTER_REGISTRATION || ($sDefaultEvent == BX_ATTENDANT_ON_PROFILE_CREATION_EVENT_AFTER_CONFIRMATION  && $oAccount != null &&  $oAccount->isConfirmed()))){
-                $bNeedRaiseEvent = true;
+                if ($oProfile->getModule() != 'system'){
+                    $bNeedRaiseEvent = true;
+                }
             }
         }
         else{

modules/boonex/videos/classes/BxVideosFormEntry.php

@@ -239,7 +239,11 @@ class BxVideosFormEntry extends BxBaseModTextFormEntry
 
     public function genCustomRowVideoEmbed(&$aInput) {
         $sSource = isset($this->aInputs['video_source']) && $this->aInputs['video_source']['value'] == 'embed' ? 'embed' : 'upload';
-        if ($sSource != 'embed') $aInput['tr_attrs']['style'] = 'display:none';
+        if ($sSource != 'embed') {
+            if (!is_array($aInput['tr_attrs']))
+                $aInput['tr_attrs'] = [];
+            $aInput['tr_attrs']['style'] = 'display:none';
+        }
         return $this->genRowStandard($aInput);
     }
 
@@ -281,6 +285,8 @@ class BxVideosFormEntry extends BxBaseModTextFormEntry
         $sJsCode = '';
 
         if ($aInput['name'] == 'video_source' && $aInput['type'] == 'radio_set') {
+            if (!is_array($aInput['attrs']))
+                $aInput['attrs'] = [];
             $aInput['attrs']['onchange'] = $this->_oModule->_oConfig->getJsObject('embeds').'.changeVideoSource(this.value);';
             $sJsCode = '';
             if ($this->_bDynamicMode) {