Solve bug #7208
!
Revert "!"

This reverts commit 65e2efff75436130780772b3ea1531af58d29a50.
Solves Bug#7210

Solve the bug when displaying icons in block courses
Ref Bug#7210
Solve bug #7210
Merge remote-tracking branch 'angel/7210' into 1.9.x

Conflicts:
	main/inc/lib/userportal.lib.php
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
merge with upstream
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
Merge remote-tracking branch 'upstream/1.9.x' into 1.9.x
Merge
Merge branch '1.9.x' of https://github.com/chamilo/chamilo-lms into 1.9.x
Merge branch '1.9.x' of https://github.com/chamilo/chamilo-lms into 1.9.x
Merge branch '0.9.x' of https://github.com/angelfqc/chamilo-lms into 1.9.x
Merge branch '0.9.x' of https://github.com/chamilo/chamilo-lms into 1.9.x
Merge branch '1.9.x' of https://github.com/chamilo/chamilo-lms into 1.9.x