#1782 Group based modules: make member to follow group upon group join

modules/base/groups/classes/BxBaseModGroupsFormsEntryHelper.php

@@ -41,10 +41,7 @@ class BxBaseModGroupsFormsEntryHelper extends BxBaseModProfileFormsEntryHelper
         $this->makeAuthorAdmin ($oGroupProfile, bx_get('initial_members'));
 
         $this->inviteMembers ($oGroupProfile, bx_get('initial_members'));
-        
-        // follow group on join
-        $this->_oModule->addFollower(bx_get_logged_profile_id(), $oGroupProfile->id());
-        
+
         return '';
     }
 

modules/base/groups/classes/BxBaseModGroupsModule.php

@@ -264,8 +264,13 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
         // new fan was added
         if ($oConnection->isConnected($oGroupProfile->id(), (int)$iInitiatorId, true)) {
             // follow group on join
-            $this->addFollower($oGroupProfile->id(), (int)$iInitiatorId);
-         
+            if (BxDolService::call($oGroupProfile->getModule(), 'act_as_profile')){
+                 $this->addFollower($oGroupProfile->id(), (int)$iInitiatorId);
+            }
+            else{
+                 $this->addFollower((int)$iInitiatorId, $oGroupProfile->id()); 
+            }
+            
             bx_alert($this->getName(), 'fan_added', $aContentInfo[$CNF['FIELD_ID']], $iGroupProfileId, array(
             	'object_author_id' => $iGroupProfileId,
             	'performer_id' => $iProfileId,