Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
55dc46b5
Commit
55dc46b5
authored
Mar 18, 2016
by
Piers Harding
Committed by
Robert Lyon
Jun 08, 2016
Browse files
Bug 1393536: activitytypemutlirecip: fix function exists
behatnotneeded Change-Id: I4fa9481ae0de06ef0255b6d523474fbd17c643b3
parent
c8dbcce7
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/module/multirecipientnotification/notification/ActivityTypeMultirecipientmessage.php
View file @
55dc46b5
...
@@ -83,7 +83,7 @@ class ActivityTypeMultirecipientmessage extends ActivityTypeUsermessage {
...
@@ -83,7 +83,7 @@ class ActivityTypeMultirecipientmessage extends ActivityTypeUsermessage {
// some stuff gets overridden by user specific stuff
// some stuff gets overridden by user specific stuff
if
(
empty
(
$user
->
method
))
{
if
(
empty
(
$user
->
method
))
{
$user
->
method
=
call_static_method
(
get_class
(
$this
),
'
default_notification_method
'
);
$user
->
method
=
$this
->
default_notification_method
(
);
}
}
if
(
empty
(
$user
->
lang
)
||
$user
->
lang
==
'default'
)
{
if
(
empty
(
$user
->
lang
)
||
$user
->
lang
==
'default'
)
{
$user
->
lang
=
get_config
(
'lang'
);
$user
->
lang
=
get_config
(
'lang'
);
...
@@ -195,6 +195,17 @@ class ActivityTypeMultirecipientmessage extends ActivityTypeUsermessage {
...
@@ -195,6 +195,17 @@ class ActivityTypeMultirecipientmessage extends ActivityTypeUsermessage {
return
'usermessage'
;
return
'usermessage'
;
}
}
/**
* get the default notification_method
*
* @param int $usrid
* @return string
*/
function
default_notification_method
()
{
$method
=
get_field
(
'activity_type'
,
'defaultmethod'
,
'name'
,
$this
->
get_type
());
return
$method
;
}
/**
/**
* get the user-specific notification_method for user $userid
* get the user-specific notification_method for user $userid
*
*
...
...
Write
Preview
Supports
Markdown
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