moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 's11_MDL-27936_send_message_master' of github.com:dongsheng/moodle

Browse source 
Conflicts:
	lib/db/services.php
	version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2011-06-29 20:00:49 +02:00
commit 1333c05ebe
3 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/db/services.php
View file

@ -226,11 +226,11 @@ $functions = array(
// === message related functions ===
'moodle_message_send_messages' => array(
'moodle_message_send_instantmessages' => array(
'classname' => 'moodle_message_external',
'methodname' => 'send_messages',
'methodname' => 'send_instantmessages',
'classpath' => 'message/externallib.php',
'description' => 'Send messages',
'description' => 'Send instant messages',
'type' => 'write',
'capabilities'=> 'moodle/site:sendmessage',
),
@ -268,7 +268,7 @@ $services = array(
'moodle_notes_create_notes',
'moodle_user_get_course_participants_by_id',
'moodle_user_get_users_by_courseid',
'moodle_message_send_messages'),
'moodle_message_send_instantmessages'),
'enabled' => 0,
'restrictedusers' => 0,
'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE