Fixing query see BT#7138
Fixing message see BT#7137
Merge branch '1.9.x' of github.com:chamilo/chamilo-lms into nuevo