xbmc/xbmc — pull request #5860 by Montellese (2014-12-01 20:01:59+00:00)
Title: fix content settings not being properly evaluated/stored

The fix from #5850 introduced another regression. This is now done the same way it was before my refactor.