Merge branch 't/10008' into major

ckeditor · Feb 13, 2013 · 376dc4d · 376dc4d
2 parents 0b94e09 + 77833bc
commit 376dc4d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/core/filter.js b/core/filter.js
@@ -72,6 +72,7 @@
 			// Add editor's default rules.
 			this.allow( 'p br', 1 );
 			this.allow( allowedContent, 1 );
+			this.allow( editor.config.extraAllowedContent, 1 );
 
 			//
 			// Add filter listeners to toHTML and toDataFormat events.