Ticket #23299: 23299.2.patch

editor.js

@@ -80 +80 @@
                 }
 
                 // Pretty it up for the source editor
-                blocklist1 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset';
+                blocklist1 = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|div|h[1-6]|p|fieldset';
                 content = content.replace(new RegExp('\\s*</('+blocklist1+')>\\s*', 'g'), '</$1>\n');
                 content = content.replace(new RegExp('\\s*<((?:'+blocklist1+')(?: [^>]*)?)>', 'g'), '\n<$1>');
 
@@ -102 +102 @@
                 content = content.replace(/\s*\[caption([^\[]+)\[\/caption\]\s*/gi, '\n\n[caption$1[/caption]\n\n');
                 content = content.replace(/caption\]\n\n+\[caption/g, 'caption]\n\n[caption');
 
-                blocklist2 = 'blockquote|ul|ol|li|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
+                blocklist2 = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|pre|fieldset';
                 content = content.replace(new RegExp('\\s*<((?:'+blocklist2+')(?: [^>]*)?)\\s*>', 'g'), '\n<$1>');
                 content = content.replace(new RegExp('\\s*</('+blocklist2+')>\\s*', 'g'), '</$1>\n');
-                content = content.replace(/<li([^>]*)>/g, '\t<li$1>');
+                content = content.replace(/<((li|dt|dd)[^>]*)>/g, '\t<$1>');
 
                 if ( content.indexOf('<hr') != -1 ) {
                         content = content.replace(/\s*<hr( [^>]*)?>\s*/g, '\n\n<hr$1>\n\n');