Skip to content

Commit 5135d41

Browse files
committed
Merge branch 't/9972' into major
2 parents 091cb61 + f980085 commit 5135d41

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

core/htmlparser/element.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ CKEDITOR.htmlParser.cssStyle = function() {
229229
if ( i == 1 )
230230
attribsArray.push( [ a, value ] );
231231
else if ( filter ) {
232+
// Loop until name isn't modified.
233+
// A little bit senseless, but IE would do that anyway
234+
// because it iterates with for-in loop even over properties
235+
// created during its run.
232236
while ( true ) {
233237
if ( !( newAttrName = filter.onAttributeName( a ) ) ) {
234238
delete attributes[ a ];

core/htmlparser/filter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146

147147
if ( itemsLength ) {
148148
// Find the index to insert the items at.
149-
for ( i = 0; i < listLength && list[ i ].pri < priority; i++ ) {
149+
for ( i = 0; i < listLength && list[ i ].pri <= priority; i++ ) {
150150
/*jsl:pass*/
151151
}
152152

0 commit comments

Comments
 (0)