mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-29 12:28:06 +01:00
Code Issues Projects Releases Wiki Activity

#4396 Change validation block. First check for empty message before checking the file existence.

Browse Source
This commit is contained in:
Master_Hans 2020-10-13 12:43:57 +03:00
parent bce06aac19
commit fc96cb859c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protected/humhub/modules/comment/models/forms/CommentForm.php
View File

@ -51,12 +51,16 @@ class CommentForm extends yii\base\Model
{
return [
[['message'], 'required', 'isEmpty' => function ($message) {
$hasFile = !empty($this->fileList) || (!$this->comment->isNewRecord && $this->comment->fileManager->find()->count());
//check if message empty and attached file exists
if (empty($message) && !$hasFile) {
throw new ServerErrorHttpException(Yii::t('CommentModule.base', 'The comment must not be empty!'));
if (!empty($message)) {
return false;
}
// Allow empty message only with file attachments
if (!empty($this->fileList) || (!$this->comment->isNewRecord && $this->comment->fileManager->find()->count())) {
return false;
}
throw new ServerErrorHttpException(Yii::t('CommentModule.base', 'The comment must not be empty!'));
}],
[['fileList'], 'safe'],
];
@ -112,7 +116,7 @@ class CommentForm extends yii\base\Model
*/
public function save()
{
/**@var Comment $this->comment*/
/**@var Comment $this ->comment */
$this->comment->setPolyMorphicRelation($this->target);
//check if model saved