Commit 205c6db5 authored by Marina Glancy's avatar Marina Glancy Committed by Damyon Wiese
Browse files

MDL-44084 atto: correct standard plugins list and namespace bug fix

parent b725a0eb
......@@ -931,8 +931,12 @@ class core_plugin_manager {
$standard_plugins = array(
'atto' => array(
'bold', 'html', 'indent', 'link', 'orderedlist', 'strike', 'title', 'unlink',
'clear', 'image', 'italic', 'media', 'outdent', 'table', 'underline', 'unorderedlist'
'accessibilitychecker', 'accessibilityhelper', 'align',
'backcolor', 'bold', 'charmap', 'clear', 'collapse', 'emoticon',
'equation', 'fontcolor', 'html', 'image', 'indent', 'italic',
'link', 'managefiles', 'media', 'noautolink', 'orderedlist',
'rtl', 'strike', 'subscript', 'superscript', 'table', 'title',
'underline', 'undo', 'unlink', 'unorderedlist'
),
'assignment' => array(
......@@ -997,7 +1001,7 @@ class core_plugin_manager {
),
'editor' => array(
'textarea', 'tinymce'
'atto', 'textarea', 'tinymce'
),
'enrol' => array(
......
......@@ -32,7 +32,7 @@ class atto extends base {
/**
* Yes you can uninstall these plugins if you want.
* @return moodle_url
* @return \moodle_url
*/
public function is_uninstall_allowed() {
return true;
......@@ -40,17 +40,17 @@ class atto extends base {
/**
* Return URL used for management of plugins of this type.
* @return moodle_url
* @return \moodle_url
*/
public static function get_manage_url() {
return new moodle_url('/admin/settings.php', array('section'=>'editorsettingsatto'));
return new \moodle_url('/admin/settings.php', array('section'=>'editorsettingsatto'));
}
/**
* Include the settings.php file from sub plugins if they provide it.
* This is a copy of very similar implementations from various other subplugin areas.
*
* @return moodle_url
* @return \moodle_url
*/
public function load_settings(\part_of_admin_tree $adminroot, $parentnodename, $hassiteconfig) {
global $CFG, $USER, $DB, $OUTPUT, $PAGE; // In case settings.php wants to refer to them.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment