Bad merge cruft in htdocs/js/tinymce/tinymce.jquery.js
Bug #1521058 reported by
Aaron Wells
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Mahara |
Fix Released
|
Low
|
Unassigned | ||
15.10 |
Fix Released
|
Low
|
Unassigned |
Bug Description
Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 5ba3418499cc419e, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked.
Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place.
It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed.
no longer affects: | mahara/16.04 |
Changed in mahara: | |
status: | Fix Committed → Fix Released |
To post a comment you must log in.
Robert filed patch https:/ /reviews. mahara. org/#/c/ 5805/1 about this issue (in master)