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
List the sessions and courses for sessions catalog - refs #7275
Extend buy_course plugin to include sessions (session mailing not done yet) - refs #7272
Add filter by date in sessions catalog - refs #7275
Set the current date for list - refs #7275
Remove unnecessary param - refs #7275
Modify the SQL sentence for get the list of sessions - refs #7275
Minor - Code conventions - refs #7275
Add subscribe button - refs #7275
Extend buy_course plugin to include sessions - refs #7272