Merge branch 'MDL-40465-master' of git://github.com/FMCorz/moodle

diff --combined lib/accesslib.php
index 7d39fc1,fe55d4e..afcc469
--- 1/lib/accesslib.php
--- 2/lib/accesslib.php
+++ b/lib/accesslib.php
@@@ -2667,7 -2667,6 +2667,7 @@@ function update_capabilities($componen
  /**
   * Deletes cached capabilities that are no longer needed by the component.
   * Also unassigns these capabilities from any roles that have them.
 + * NOTE: this function is called from lib/db/upgrade.php
   *
   * @access private
   * @param string $component examples: 'moodle', 'mod_forum', 'block_quiz_results'
@@@ -7262,25 -7261,6 +7262,6 @@@ function get_courseid_from_context(cont
      }
  }
  
- /**
-  * Extracts the relevant capabilities given a contextid.
-  * All case based, example an instance of forum context.
-  * Will fetch all forum related capabilities, while course contexts
-  * Will fetch all capabilities
-  *
-  * capabilities
-  * `name` varchar(150) NOT NULL,
-  * `captype` varchar(50) NOT NULL,
-  * `contextlevel` int(10) NOT NULL,
-  * `component` varchar(100) NOT NULL,
-  *
-  * @deprecated since 2.2
-  * @param context $context
-  * @return array
-  */
- function fetch_context_capabilities(context $context) {
-     return $context->get_capabilities();
- }
  
  /**
   * Runs get_records select on context table and returns the result