[#18530] - Bad merge line 138? joomla-cms/libraries/cms/html/jquery.php
- Closed
- 8 Nov 2017
- Medium
- Build: staging
- # 18530
Steps to reproduce the issue
This code has been corrupted by a bad merge maybe?
Line 138 of joomla-cms/libraries/cms/html/jquery.php
Expected result
Actual result
System information (as much as possible)
Additional comments
joomla-cms-bot
- | Labels |
Added:
?
|
||
| Category | ⇒ | JavaScript |
| Status | New | ⇒ | Information Required |
I needed a snippet of this code as I have a token error on my 3.7 install, the code has gone all screwy at line 138. The code may still function but there is a
<<<JS
block of badly formatted code
JS
I see things like this appear when my GIT has a conflict.
If this is just an inexperience issue on my part (i.e <<<JS is somehow valid, I appologise
This is valid code and used in several places
| Status | Information Required | ⇒ | Discussion |
Apologies for wasting your time, never seen it before. I have a problem with csrf on my joomla 3.7.4 which is why I spotted it. Slinking away now with my tail between my legs
@MOLEDesign if this Issue is solved please close it, thanks.
please upgrade
lots of fixes since 3.7.4
| Status | Discussion | ⇒ | Closed |
| Closed_Date | 0000-00-00 00:00:00 | ⇒ | 2017-11-08 13:55:38 |
| Closed_By | ⇒ | brianteeman |
can you please explain what you mean?
This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/18530.