Merge branch 'MDL-50049-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jul 2015 18:24:13 +0000 (20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 9 Jul 2015 18:24:13 +0000 (20:24 +0200)
1  2 
lang/en/grades.php
lib/upgrade.txt

Simple merge
diff --cc lib/upgrade.txt
@@@ -6,15 -6,113 +6,121 @@@ information provided here is intended e
  * \core\progress\null is renamed to \core\progress\none for improved PHP7 compatibility as null is a reserved word (see MDL-50453).
  * \webservice_xmlrpc_client now respects proxy server settings. If your XMLRPC server is available on your local network and not via your proxy server, you may need to add it to the list of proxy
    server exceptions in $CFG->proxybypass. See MDL-39353 for details.
 -    css_minify_css()
 +* Group and groupings idnumbers can now be passed to and/or are returned from the following web services functions:
 +  ** core_group_external::create_groups
 +  ** core_group_external::get_groups
 +  ** core_group_external::get_course_groups
 +  ** core_group_external::create_groupings
 +  ** core_group_external::update_groupings
 +  ** core_group_external::get_groupings
 +  ** core_group_external::get_course_groupings
 +  ** core_group_external::get_course_user_groups
+ * Following functions are removed from core. See MDL-50049 for details.
+     password_compat_not_supported()
+     session_get_instance()
+     session_is_legacy()
+     session_kill_all()
+     session_touch($sid)
+     session_kill($sid)
+     session_kill_user()
+     session_set_user()
+     session_is_loggedinas()
+     session_get_realuser()
+     session_loginas()
+     js_minify()
+     css_minify_css()
 -    )get_course_category_tree()
+     update_login_count()
+     reset_login_count()
+     update_log_display_entry()
+     get_recent_enrolments()
+     groups_filter_users_by_course_module_visible()
+     groups_course_module_visible()
+     error()
+     formerr()
+     editorhelpbutton()
+     editorshortcutshelpbutton()
+     choose_from_menu()
+     update_event()
+     get_generic_section_name()
+     get_all_sections()
+     add_mod_to_section()
+     get_all_mods()
+     get_course_section()
+     format_weeks_get_section_dates()
+     get_print_section_cm_text()
+     print_section_add_menus()
+     make_editing_buttons()
+     print_section()
+     print_overview()
+     print_recent_activity()
+     delete_course_module()
+     update_category_button()
+     make_categories_list()
+     category_delete_move()
+     category_delete_full()
+     move_category()
+     course_category_hide()
+     course_category_show()
+     get_course_category()
+     create_course_category()
+     get_all_subcategories()
+     get_child_categories()
+     get_categories()
+     print_course_search()
+     print_my_moodle()
+     print_remote_course()
+     print_remote_host()
+     print_whole_category_list()
+     print_category_info()
 -     blog_get_context_url()
++    get_course_category_tree()
+     print_courses()
+     print_course()
+     get_category_courses_array()
+     get_category_courses_array_recursively()
++    blog_get_context_url()
+     get_courses_wmanagers()
+     convert_tree_to_html()
+     convert_tabrows_to_tree()
+     can_use_rotated_text()
+     get_parent_contexts()
+     get_parent_contextid()
+     get_child_contexts()
+     create_contexts(()
+     cleanup_contexts()
+     build_context_path()
+     rebuild_contexts()
+     preload_course_contexts()
+     context_moved()
+     fetch_context_capabilities()
+     context_instance_preload()
+     get_contextlevel_name()
+     print_context_name()
+     mark_context_dirty()
+     delete_context()
+     get_context_url()
+     get_course_context()
+     get_user_courses_bycap()
+     get_role_context_caps()
+     get_courseid_from_context()
+     context_instance_preload_sql()
+     get_related_contexts_string()
+     get_plugin_list_with_file()
+     check_browser_operating_system()
+     check_browser_version()
+     get_device_type()
+     get_device_type_list()
+     get_selected_theme_for_device_type()
+     get_device_cfg_var_name()
+     get_user_device_type()
+     get_browser_version_classes()
+     generate_email_supportuser()
+     badges_get_issued_badge_info()
+     can_use_html_editor()
+     enrol_cohort_get_cohorts()
+     enrol_cohort_can_view_cohort()
+     cohort_get_visible_list()
+     enrol_cohort_enrol_all_users()
+     enrol_cohort_search_cohorts()
  
  === 2.9.1 ===