AntonLV 8 лет назад
Родитель
Сommit
e1b3130425

+ 3 - 3
modules/boonex/files/updates/9.0.4_9.0.5/source/classes/BxFilesFormsEntryHelper.php

@@ -31,7 +31,7 @@ class BxFilesFormsEntryHelper extends BxBaseModFilesFormsEntryHelper
 			$iContentId = array_pop($aContentIds);
 			$aContentInfo = $this->_oModule->_oDb->getContentInfoById($iContentId);
 			$oProfile = BxDolProfile::getInstance($aContentInfo[$CNF['FIELD_AUTHOR']]);
-			$sUri = BxDolService::call($oProfile->getModule(), 'is_group_profile') ? $CNF['URI_GROUP_ENTRIES'] . '&profile_id=' . $oProfile->id() : $CNF['URI_AUTHOR_ENTRIES'] . '&profile_id=' . bx_get_logged_profile_id();
+			$sUri = $CNF['URI_AUTHOR_ENTRIES'] . '&profile_id=' . ($oProfile ? $oProfile->id() : bx_get_logged_profile_id());
 			$this->_redirectAndExit('page.php?i=' . $sUri);
 		}
 		else{
@@ -43,8 +43,8 @@ class BxFilesFormsEntryHelper extends BxBaseModFilesFormsEntryHelper
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
         $oProfile = BxDolProfile::getInstance($aContentInfo[$CNF['FIELD_AUTHOR']]);
-        if (BxDolService::call($oProfile->getModule(), 'is_group_profile'))
-            $this->_redirectAndExit('page.php?i=' . $CNF['URI_GROUP_ENTRIES'] . '&profile_id=' . $oProfile->id());
+        if ($oProfile)
+            $this->_redirectAndExit('page.php?i=' . $CNF['URI_AUTHOR_ENTRIES'] . '&profile_id=' . $oProfile->id());
         else
             $this->_redirectAndExit($CNF['URL_HOME'], true, array(
                 'account_id' => getLoggedId(),

+ 3 - 1
modules/boonex/photos/updates/9.0.0_9.0.1/source/classes/BxPhotosSearchResult.php

@@ -133,7 +133,9 @@ class BxPhotosSearchResult extends BxBaseModTextSearchResult
         if(empty($aResult) || !is_array($aResult))
             return $aResult;
 
-        $this->aUnitParams = array_merge($this->aUnitParams, $this->aParams);
+		if(!empty($this->aParams) && is_array($this->aParams))
+        	$this->aUnitParams = array_merge($this->aUnitParams, $this->aParams);
+
         $this->aUnitParams['start'] = $this->aCurrent['paginate']['start'];
         $this->aUnitParams['per_page'] = $this->aCurrent['paginate']['perPage'];