Merge branch 'MDL-56916-master-normalizedoc' of git://github.com/mudrd8mz/moodle

This commit is contained in:
Dan Poltawski 2016-11-14 13:09:48 +00:00
commit 55e54953a4
2 changed files with 2 additions and 2 deletions

View File

@ -1029,7 +1029,7 @@ $cache = '.var_export($cache, true).';
* Note: this does not verify the validity of plugin or type names.
*
* @param string $component
* @return array as (string)$type => (string)$plugin
* @return array two-items list of [(string)type, (string|null)name]
*/
public static function normalize_component($component) {
if ($component === 'moodle' or $component === 'core' or $component === '') {

View File

@ -214,7 +214,7 @@ function get_plugin_directory($plugintype, $name) {
* @deprecated since 2.6, use core_component::normalize_component()
*
* @param string $component
* @return array as (string)$type => (string)$plugin
* @return array two-items list of [(string)type, (string|null)name]
*/
function normalize_component($component) {