Fix #379 User(s) browsing this thread incorrect when linking to post
Fix #381 dbpdoEngine::num_rows() doesn't work as expected
Minor formatting
Fix #281 [Theme] Creating new theme using admin panel
Fix #295 Search & replace in admin panel
Fix #317 User Merge bug/problem
Make sure users aren't on their own buddy/ignore lists
Build a new array instead of modifying $stylesheet
Call array_diff() before implode()

I missed that.
trim() imploded lists

This _should_ work as we can never have a comma at the beginning or end...
Merge pull request #383 from nmalcolm/fix-281

Fix #281 [Theme] Creating new theme using admin panel
Fixes #389 Misleading text under 'Bans Ending Soon' in ModCP
Merge pull request #390 from PaulBender/fix-389

Fixes #389 Misleading text under 'Bans Ending Soon' in ModCP
Remove unnecessary intval()
Simplify querying for data
Remove users on ignore list from buddy list
Merge pull request #384 from nmalcolm/fix-295

Fix #295 Search & replace in admin panel
Merge pull request #380 from nmalcolm/fix-379

Fix #379 User(s) browsing this thread incorrect when linking to post
Merge pull request #382 from nmalcolm/fix-381

 Fix #381 dbpdoEngine::num_rows() doesn't work as expected
Merge pull request #386 from nmalcolm/fix-317

Fix #317 User Merge bug/problem