Holy shit, this is really really nasty old JS code. I would love to dump this if possible.
Massive linting!
Avoid short open tag for PHP.
Merge branch 'develop' of git://github.com/shish/shimmie2 into develop
Merge branch 'develop' of github.com:jgen/shimmie2 into linting

Manually resolved conflicts:
	ext/chatbox/js/yshout.js
More linting. This time of the JavaScript for the chat-box extension.
Push the headers for the chatbox even further down to make sure that jQuery is already loaded.
Give these HTML headers some slight priority over the default value of 50.
These sorts are necessary on the header arrays, otherwise the relative priority of certain headers is not respected.
More JS linting.
Add the jshint comment to alter how scrutinzer-ci deals with the js.
Some more JS linting.
Even more linting of JS files.
Some more linting on the bookmarklet.js file.
The 'tags' box actually has a different ID.
Not sure if we really need the triple equals.
Prevent scrutinizer-ci from complaining about these fall-thoughs.
Rename variable to make it more clear.
From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated.
Changing to public as that is really what these variables are anyways.
From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated.
Changing to public as that is really what these variables are anyways.