Public bug reported:
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.
** Affects: mahara
Importance: Undecided
Status: Confirmed
** Affects: mahara/15.10
Importance: Undecided
Status: Confirmed
** Affects: mahara/16.04
Importance: Undecided
Status: Confirmed
** Description changed:
Robert noticed that there is a merge conflict ">>>>>" line left over in
tinymce.jquery.js. It was apparently introduced in commit 3db4ecaf, 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.
--
You received this bug notification because you are a member of Mahara
Contributors, which is subscribed to Mahara.
Matching subscriptions: Subscription for all Mahara Contributors -- please ask
on #mahara-dev or mahara.org forum before editing or unsubscribing it!
https://bugs.launchpad.net/bugs/1521058
Title:
Bad merge cruft in htdocs/js/tinymce/tinymce.jquery.js
Status in Mahara:
Confirmed
Status in Mahara 15.10 series:
Confirmed
Status in Mahara 16.04 series:
Confirmed
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.
To manage notifications about this bug go to:
https://bugs.launchpad.net/mahara/+bug/1521058/+subscriptions
_______________________________________________
Mailing list: https://launchpad.net/~mahara-contributors
Post to : [email protected]
Unsubscribe : https://launchpad.net/~mahara-contributors
More help : https://help.launchpad.net/ListHelp
