소스 검색

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

AntonLV 5 년 전
부모
커밋
1b9f553833
1개의 변경된 파일과 13개의 추가작업 그리고 2개의 파일을 삭제
  1. 13 2
      modules/base/groups/classes/BxBaseModGroupsFormsEntryHelper.php

+ 13 - 2
modules/base/groups/classes/BxBaseModGroupsFormsEntryHelper.php

@@ -73,12 +73,20 @@ class BxBaseModGroupsFormsEntryHelper extends BxBaseModProfileFormsEntryHelper
     protected function redirectAfterEdit($aContentInfo)
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
+        $sUrl = '';
         if (bx_get('initial_members') && isset($CNF['URL_ENTRY_FANS'])){
-            $this->_redirectAndExit($CNF['URL_ENTRY_FANS'] . '&profile_id=' . $aContentInfo['profile_id']);
+            $sUrl = $CNF['URL_ENTRY_FANS'] . '&profile_id=' . $aContentInfo['profile_id'];
         }
         else{
-            $this->_redirectAndExit('page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']]);
+            $sUrl = 'page.php?i=' . $CNF['URI_VIEW_ENTRY'] . '&id=' . $aContentInfo[$CNF['FIELD_ID']];
         }
+        
+        bx_alert($this->_oModule->getName(), 'redirect_after_edit', 0, false, array(
+            'content' => $aContentInfo,
+            'override_result' => &$sUrl,
+        ));
+        
+        $this->_redirectAndExit($sUrl);
     }
     
     public function onDataDeleteAfter ($iContentId, $aContentInfo, $oProfile)
@@ -114,6 +122,9 @@ class BxBaseModGroupsFormsEntryHelper extends BxBaseModProfileFormsEntryHelper
 
         $iGroupId = $oGroupProfile->id();
 
+        if (!is_array($aInitialProfiles))
+			$aInitialProfiles = [$aInitialProfiles];
+        
         // insert invited members, so they will join without confirmation
         foreach($aInitialProfiles as $iProfileId) {
             $oProfile = BxDolProfile::getInstance($iProfileId);