! There really is no good reason now not to be ORDER BY LENGTH(code) for smileys. MySQL supports it now after those rocky days when we couldn't rely on it, PGSQL and SQLite seem to support it as far as I can tell, it's also cached so the filesort isn't the killer it could necessarily be. Let's do this and fix #1091 while we're at it.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! We don't use these queries any more, don't need their query-specific replacements either.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1128 from Arantor/release-2.1

Fix the smiley ordering issues