Use correct controller base class.
Merge branch 'master' of github.com:fluxbb/core