Merge branch 'MDL-49686-master' of git://github.com/merrill-oakland/moodle

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js
index e425c3b,c27f152..fbf8eef
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
index 0b662e0,b76d5ec..377e5eb
Binary files differ

diff --cc lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js
index d7e5c09,edb0d0c..22e967a
Binary files differ

diff --cc lib/editor/atto/yui/src/editor/js/clean.js
index a526fc1,0530329..0c37c58
--- 1/lib/editor/atto/yui/src/editor/js/clean.js
--- 2/lib/editor/atto/yui/src/editor/js/clean.js
+++ b/lib/editor/atto/yui/src/editor/js/clean.js
@@@ -286,14 -298,24 +286,22 @@@ EditorClean.prototype = 
  
          // Run some more rules that care about quotes and whitespace.
          rules = [
-             // Remove MSO-blah, MSO:blah in style attributes. Only removes one or more that appear in succession.
-             {regex: /(<[^>]*?style\s*?=\s*?"[^>"]*?)(?:[\s]*MSO[-:][^>;"]*;?)+/gi, replace: "$1"},
-             // Remove MSO classes in class attributes. Only removes one or more that appear in succession.
-             {regex: /(<[^>]*?class\s*?=\s*?"[^>"]*?)(?:[\s]*MSO[_a-zA-Z0-9\-]*)+/gi, replace: "$1"},
-             // Remove Apple- classes in class attributes. Only removes one or more that appear in succession.
-             {regex: /(<[^>]*?class\s*?=\s*?"[^>"]*?)(?:[\s]*Apple-[_a-zA-Z0-9\-]*)+/gi, replace: "$1"},
+             // Get all style attributes so we can work on them.
+             {regex: /(<[^>]*?style\s*?=\s*?")([^>"]*)(")/gi, replace: function(match, group1, group2, group3) {
+                     // Remove MSO-blah, MSO:blah style attributes.
+                     group2 = group2.replace(/(?:^|;)[\s]*MSO[-:](?:&[\w]*;|[^;"])*/gi,"");
+                     return group1 + group2 + group3;
+                 }},
+             // Get all class attributes so we can work on them.
+             {regex: /(<[^>]*?class\s*?=\s*?")([^>"]*)(")/gi, replace: function(match, group1, group2, group3) {
+                     // Remove MSO classes.
+                     group2 = group2.replace(/(?:^|[\s])[\s]*MSO[_a-zA-Z0-9\-]*/gi,"");
+                     // Remove Apple- classes.
+                     group2 = group2.replace(/(?:^|[\s])[\s]*Apple-[_a-zA-Z0-9\-]*/gi,"");
+                     return group1 + group2 + group3;
+                 }},
              // Remove OLE_LINK# anchors that may litter the code.
 -            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""},
 -            // Remove empty spans, but not ones from Rangy.
 -            {regex: /<span(?![^>]*?rangySelectionBoundary[^>]*?)[^>]*>(&nbsp;|\s)*<\/span>/gi, replace: ""}
 +            {regex: /<a [^>]*?name\s*?=\s*?"OLE_LINK\d*?"[^>]*?>\s*?<\/a>/gi, replace: ""}
          ];
  
          // Apply the rules.