fixes #944
Thanks to HoverClub for the fix :)

Signed-off-by: Suki <suki@missallsunday.com>
Merge branch 'release-2.1' of git://github.com/SimpleMachines/SMF2.1.git into fixes
Revert the "fix" #944
doesn't really fix the issue and causes admins to lose all their permissions

Signed-off-by: Suki <suki@missallsunday.com>
Send the admin to boardIndex fixes #956

Signed-off-by: Suki <suki@missallsunday.com>
Let the upgrade to convert all attachments

Signed-off-by: Suki <suki@missallsunday.com>
Add the ".dat" extension

Signed-off-by: Suki <suki@missallsunday.com>
getLegacyAttachmentFilename() shouldn't be required anymore

Signed-off-by: Suki <suki@missallsunday.com>
redirect moderators to BoardIndex #956

Signed-off-by: Suki <suki@missallsunday.com>
Yet another hook

Signed-off-by: Suki <suki@missallsunday.com>
Update the link to git aliases
#982

Signed-off-by: Suki <suki@missallsunday.com>
! Consistency is a beautiful thing...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Minor code layout tweak

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1067 from Oldiesmann/release-2.1

! Consistency is a beautiful thing...
! count() doesn't work too well on non-array objects...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #1068 from Oldiesmann/release-2.1

! count() doesn't work too well on non-array objects...
! A few more icon removals

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! One more image to die!

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

More images dealt with.
! And another one that I can't find used anywhere.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Let's combine some of the smaller sprites we have into the bigger one. There's a few little bits that needs fixing elsewhere but nothing we can't handle.

Signed-off-by: Peter Spicer <sleeping@myperch.org>