Allow INCLUDEJS to include files outside the style directory#880
Conversation
…ate dir Also added type="text/javascript" to the generated script tag. PHPBB3-10944
|
Ok two things: Why only {FOO}/x/y and not x/y{FOO}/{BAR}? And please add tests for this. |
|
Oh and please enter your pull request as a proposed patch in the ticket so one can find it from there as well. |
|
Actually the whole deal about allowing variables in paths to include seems to be an entirely unrelated separate issue? Can't you just create a ticket for that and deal with it separately? |
|
Same thing actually applies for the type="text/javascript" bit. It's not necessary in HTML5. If you want to add it back please create a ticket that explains why, and do so in a separate PR. |
|
Yes, there are two different issues here, it just so happens that allowing for {FOO}/a/b allows INCLUDEJS to include scripts outside the style's template directory. That's why the two issues are connected here. However, I've done some more testing and it seems there is at least one other code path that can be taken that still prepends the style's template path erroneously. I think it best if you could close this PR (again, sorry >_<) and I will create another ticket for the {FOO}/a/b issue but restrict this ticket to fixing the other code path. |
|
Alright, no problem. |
3 participants
Ticket: http://tracker.phpbb.com/browse/PHPBB3-10944