mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-21 07:29:53 +01:00
Code Issues Projects Releases Wiki Activity

Workaround for #2047 - Only throw exceptions while assambling stream entries in non production environments.

Browse Source
This commit is contained in:
buddha87 2016-11-09 14:44:25 +01:00
parent d0c82ec115
commit 4180c30784
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
protected/humhub/modules/content/components/actions/Stream.php
View File

@ -247,25 +247,33 @@ class Stream extends \yii\base\Action
$generatedWallEntryIds = [];
$lastEntryId = "";
foreach ($wallEntries as $wallEntry) {
try {
$underlyingObject = $wallEntry->content->getPolymorphicRelation();
$underlyingObject = $wallEntry->content->getPolymorphicRelation();
if ($underlyingObject === null) {
throw new Exception('Could not get contents underlying object!');
}
if ($underlyingObject === null) {
throw new Exception('Could not get contents underlying object!');
$underlyingObject->populateRelation('content', $wallEntry->content);
$output .= $this->controller->renderAjax('@humhub/modules/content/views/layouts/wallEntry', [
'entry' => $wallEntry,
'user' => $underlyingObject->content->user,
'mode' => $this->mode,
'object' => $underlyingObject,
'content' => $underlyingObject->getWallOut()
], true);
$generatedWallEntryIds[] = $wallEntry->id;
$lastEntryId = $wallEntry->id;
} catch(\yii\base\Exception $e) {
// We do not want to kill the stream action in prod environments.
if(YII_ENV_PROD) {
Yii::error($e);
} else {
throw $e;
}
}
$underlyingObject->populateRelation('content', $wallEntry->content);
$output .= $this->controller->renderAjax('@humhub/modules/content/views/layouts/wallEntry', [
'entry' => $wallEntry,
'user' => $underlyingObject->content->user,
'mode' => $this->mode,
'object' => $underlyingObject,
'content' => $underlyingObject->getWallOut()
], true);
$generatedWallEntryIds[] = $wallEntry->id;
$lastEntryId = $wallEntry->id;
}
return [