Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 7411)
+++ /CKEditor/trunk/CHANGES.html	(revision 7412)
@@ -78,4 +78,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/8247">#8247</a> : [IE] Fix error when indent with page breaks inside of contents.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/8540">#8540</a> : Fix malformed HTML list/table with text directly inside of it.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/8774">#8774</a> : Fix entities plugin to allow it to be configured to only output XML entities.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/plugins/entities/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/entities/plugin.js	(revision 7411)
+++ /CKEditor/trunk/_source/plugins/entities/plugin.js	(revision 7412)
@@ -115,23 +115,25 @@
 			{
 				// Mandatory HTML base entities.
-				var selectedEntities = '';
+				var selectedEntities = [];
 
 				if ( config.basicEntities !== false )
-					selectedEntities += htmlbase;
+					selectedEntities.push( htmlbase );
 
 				if ( config.entities )
 				{
-					selectedEntities += ',' + entities;
+					if ( selectedEntities.length )
+						selectedEntities.push( entities )
+
 					if ( config.entities_latin )
-						selectedEntities += ',' + latin;
+						selectedEntities.push( latin );
 
 					if ( config.entities_greek )
-						selectedEntities += ',' + greek;
+						selectedEntities.push( greek );
 
 					if ( config.entities_additional )
-						selectedEntities += ',' + config.entities_additional;
+						selectedEntities.push( config.entities_additional );
 				}
 
-				var entitiesTable = buildTable( selectedEntities );
+				var entitiesTable = buildTable( selectedEntities.join( ',' ) );
 
 				// Create the Regex used to find entities in the text, leave it matches nothing if entities are empty.