From: Marina Glancy <marina@moodle.com>
Date: Tue, 25 Mar 2014 10:03:54 +0000 (+0800)
Subject: MDL-44084 atto: correct standard plugins list and namespace bug fix
X-Git-Tag: v2.7.0-beta~193^2
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=205c6db50d934b34c81722524c487de3152cd989

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

diff --git a/lib/classes/plugin_manager.php b/lib/classes/plugin_manager.php
index 3ab3c8ed690..d06464b6435 100644
--- a/lib/classes/plugin_manager.php
+++ b/lib/classes/plugin_manager.php
@@ -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(
diff --git a/lib/editor/atto/classes/plugininfo/atto.php b/lib/editor/atto/classes/plugininfo/atto.php
index 32c91bb0c83..c4fd0374f96 100644
--- a/lib/editor/atto/classes/plugininfo/atto.php
+++ b/lib/editor/atto/classes/plugininfo/atto.php
@@ -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.