Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taskonsite-архив-перенесен
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Korolev
taskonsite-архив-перенесен
Commits
8721bbff
Commit
8721bbff
authored
Feb 25, 2016
by
Шакарим Сапа
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- FIX
parent
abab4f06
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
common/modules/triggers/models/TriggerTrigger.php
common/modules/triggers/models/TriggerTrigger.php
+1
-2
No files found.
common/modules/triggers/models/TriggerTrigger.php
View file @
8721bbff
...
...
@@ -238,7 +238,6 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
$newMessage
=
$sender
->
createEmailMessage
(
$this
->
name
,
$email
,
$templateModel
->
subject
,
$template
->
getTemplate
(),
$newListId
);
// Decode result
$newMessageObject
=
Json
::
decode
(
$newMessage
);
return
true
;
if
(
array_key_exists
(
'result'
,
$newMessageObject
)
&&
array_key_exists
(
'message_id'
,
$newMessageObject
[
'result'
]))
{
// Get the message ID
$newMessageId
=
$newMessageObject
[
'result'
][
'message_id'
];
...
...
@@ -269,7 +268,7 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
return
$error
;
}
}
else
{
$error
=
(
array_key_exists
(
'error'
,
$newMessageObject
))
?
$newMessageObject
[
'error'
]
:
'Неизвестная ошибка (CreateMessage)'
;
//
$error = (array_key_exists('error', $newMessageObject)) ? $newMessageObject['error'] : 'Неизвестная ошибка (CreateMessage)';
return
$newMessage
;
}
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment