Merge branch 'MDL-54032-master' of git://github.com/jleyva/moodle

diff --cc lib/db/services.php
index 6956236,7d37156..c0dc3b2
--- 1/lib/db/services.php
--- 2/lib/db/services.php
+++ b/lib/db/services.php
@@@ -238,7 -248,8 +248,8 @@@ $functions = array
          'description' => 'Return course details',
          'type' => 'read',
          'capabilities' => 'moodle/course:view, moodle/course:update, moodle/course:viewhiddencourses',
 -        'ajax' => '1',
 +        'ajax' => true,
+         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
      'core_course_import_course' => array(
          'classname' => 'core_course_external',
@@@ -254,7 -265,8 +265,8 @@@
          'classpath' => 'course/externallib.php',
          'description' => 'Search courses by (name, module, block, tag)',
          'type' => 'read',
 -        'ajax' => '1',
 +        'ajax' => true,
+         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
      'core_course_update_categories' => array(
          'classname' => 'core_course_external',
@@@ -342,8 -359,9 +359,9 @@@
          'description' => 'Return all raw strings (with {$a->xxx}), for a specific component ' .
              '- similar to core get_component_strings(), call',
          'type' => 'read',
 -        'loginrequired' => '',
 -        'ajax' => '1',
 +        'loginrequired' => false,
 +        'ajax' => true,
+         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
      'core_get_fragment' => array(
          'classname' => 'core_external',
@@@ -782,8 -824,8 +824,9 @@@
          'description' => 'Retrieve users\' information for a specified unique field - If you want to do a user search, use '
              . 'core_user_get_users()',
          'type' => 'read',
-         'capabilities' => 'moodle/user:viewdetails, moodle/user:viewhiddendetails, moodle/course:useremail, moodle/user:update'
+         'capabilities' => 'moodle/user:viewdetails, moodle/user:viewhiddendetails, moodle/course:useremail, moodle/user:update',
 +        'ajax' => true,
+         'services' => array(MOODLE_OFFICIAL_MOBILE_SERVICE),
      ),
      'core_user_remove_user_device' => array(
          'classname' => 'core_user_external',
@@@ -1559,62 -1605,7 +1606,7 @@@
  
  $services = array(
     'Moodle mobile web service'  => array(
-         'functions' => array (
-             'core_badges_get_user_badges',
-             'core_calendar_get_calendar_events',
-             'core_comment_get_comments',
-             'core_completion_get_activities_completion_status',
-             'core_completion_get_course_completion_status',
-             'core_completion_mark_course_self_completed',
-             'core_completion_update_activity_completion_status_manually',
-             'core_course_get_contents',
-             'core_course_get_course_module',
-             'core_course_get_course_module_by_instance',
-             'core_course_get_courses',
-             'core_course_search_courses',
-             'core_course_view_course',
-             'core_enrol_get_course_enrolment_methods',
-             'core_enrol_get_enrolled_users',
-             'core_enrol_get_users_courses',
-             'core_files_get_files',
-             'core_get_component_strings',
-             'core_grades_update_grades',
-             'core_group_get_activity_allowed_groups',
-             'core_group_get_activity_groupmode',
-             'core_group_get_course_user_groups',
-             'core_message_block_contacts',
-             'core_message_create_contacts',
-             'core_message_delete_contacts',
-             'core_message_delete_message',
-             'core_message_get_blocked_users',
-             'core_message_get_contacts',
-             'core_message_get_messages',
-             'core_message_mark_message_read',
-             'core_message_search_contacts',
-             'core_message_send_instant_messages',
-             'core_message_unblock_contacts',
-             'core_notes_create_notes',
-             'core_notes_delete_notes',
-             'core_notes_get_course_notes',
-             'core_notes_view_notes',
-             'core_question_update_flag',
-             'core_rating_get_item_ratings',
-             'core_user_add_user_device',
-             'core_user_add_user_private_files',
-             'core_user_get_course_user_profiles',
-             'core_user_get_users_by_field',
-             'core_user_remove_user_device',
-             'core_user_view_user_list',
-             'core_user_view_user_profile',
-             'core_webservice_get_site_info',
-             'enrol_guest_get_instance_info',
-             'enrol_self_enrol_user',
-             'enrol_self_get_instance_info',
-             'gradereport_user_get_grades_table',
-             'gradereport_user_view_grade_report',
-             'message_airnotifier_are_notification_preferences_configured',
-             'message_airnotifier_is_system_configured',
-             ),
 -        'functions' => array(),
++        'functions' => array(), // Unused as we add the service in each function definition, third party services would use this.
          'enabled' => 0,
          'restrictedusers' => 0,
          'shortname' => MOODLE_OFFICIAL_MOBILE_SERVICE,

diff --cc version.php
index 3300873,d2cc772..951c654
--- 1/version.php
--- 2/version.php
+++ b/version.php
@@@ -29,7 -29,7 +29,7 @@@
  
  defined('MOODLE_INTERNAL') || die();
  
- $version  = 2016050200.00;              // YYYYMMDD      = weekly release date of this DEV branch.
 -$version  = 2016042900.04;              // YYYYMMDD      = weekly release date of this DEV branch.
++$version  = 2016050200.01;              // YYYYMMDD      = weekly release date of this DEV branch.
                                          //         RR    = release increments - 00 in DEV branches.
                                          //           .XX = incremental changes.