Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html (revision 7197)
+++ /CKEditor/trunk/CHANGES.html (revision 7198)
@@ -54,4 +54,5 @@
#7943 : CSS conflict no longer appears when the page styles set the float
property of label
elements.
#8016 : [WebKit] Flash content is not visible when previewing content.
+ #6908 : Text color should always be applied to the linked text.
Updated the following language files:
- #8128 : Italian;
Index: /CKEditor/trunk/_source/plugins/colorbutton/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/colorbutton/plugin.js (revision 7197)
+++ /CKEditor/trunk/_source/plugins/colorbutton/plugin.js (revision 7198)
@@ -142,6 +142,6 @@
function( element )
{
- // Fore color style must be applied inside links instead of around it.
- return element.getName() != 'a' || isUnstylable( element );
+ // Fore color style must be applied inside links instead of around it. (#4772,#6908)
+ return !( element.is( 'a' ) || element.getElementsByTag( 'a' ).count() ) || isUnstylable( element );
};