Merged course listing fix from stable

This commit is contained in:
moodler
2004-12-15 13:33:40 +00:00
parent 2d2da684c6
commit 0f06e85abb
+4 -4
View File
@@ -236,7 +236,7 @@
unset($course); // To avoid unwanted language effects later
$courses = get_courses_page($category->id, 'c.sortorder ASC',
'c.id,c.sortorder,c.shortname,c.fullname,c.summary,c.visible,c.teacher',
'c.id,c.sortorder,c.shortname,c.fullname,c.summary,c.visible,c.teacher,c.guest,c.password',
$totalcount, $page*$perpage, $perpage);
$numcourses = count($courses);
@@ -357,17 +357,17 @@
echo "</td>";
} else {
echo "<td align=\"right\">";
if ($acourse->guest ) {
if (!empty($acourse->guest)) {
echo '<a href="view.php?id='.$acourse->id.'"><img hspace="2" title="'.
$strallowguests.'" alt="" height="16" width="16" border="0" src="'.
$pixpath.'/i/user.gif" /></a>';
}
if ($acourse->password) {
if (!empty($acourse->password)) {
echo '<a href="view.php?id='.$acourse->id.'"><img hspace="2" title="'.
$strrequireskey.'" alt="" height="16" width="16" border="0" src="'.
$pixpath.'/i/key.gif" /></a>';
}
if ($acourse->summary) {
if (!empty($acourse->summary)) {
link_to_popup_window ("/course/info.php?id=$acourse->id", "courseinfo",
'<img hspace="2" alt="info" height="16" width="16" border="0" src="'.$pixpath.'/i/info.gif" />',
400, 500, $strsummary);