From 169fc66a1592d68507c46f16a13cb0e8c1e9270e Mon Sep 17 00:00:00 2001
From: moodler <moodler>
Date: Mon, 18 Oct 2004 06:00:26 +0000
Subject: [PATCH] Merged small speed improvements from STABLE
---
course/category.php | 4 +++-
lib/datalib.php | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/course/category.php b/course/category.php
index 060d45f5130..4a5e1c46cbb 100644
--- a/course/category.php
+++ b/course/category.php
@@ -240,7 +240,9 @@
/// Print out all the courses
unset($course); // To avoid unwanted language effects later
- $courses = get_courses_page($category->id, "c.sortorder ASC", "c.*", $totalcount, $page*$perpage, $perpage);
+ $courses = get_courses_page($category->id, 'c.sortorder ASC',
+ 'c.id,c.sortorder,c.shortname,c.fullname,c.summary,c.visible',
+ $totalcount, $page*$perpage, $perpage);
$numcourses = count($courses);
if (!$courses) {
diff --git a/lib/datalib.php b/lib/datalib.php
index b2b30adf2f5..70d96479f2d 100644
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -1972,7 +1972,7 @@ function get_courses($categoryid='all', $sort='c.sortorder ASC', $fields='c.*')
$selectsql = $CFG->prefix .'course c ';
}
- $courses = get_records_sql('SELECT DISTINCT '. $fields .' FROM '. $selectsql .' ORDER BY '. $sort);
+ $courses = get_records_sql('SELECT '. $fields .' FROM '. $selectsql .' ORDER BY '. $sort);
if ($courses and (!$hideallinvisible) and (!$showallinvisible)) { // For ordinary users we need to check visibility
foreach ($courses as $key => $course) {
@@ -2038,7 +2038,7 @@ function get_courses_page($categoryid='all', $sort='c.sortorder ASC', $fields='c
$selectsql = $CFG->prefix .'course c ';
}
- $courses = get_records_sql('SELECT DISTINCT '. $fields .' FROM '. $selectsql .' ORDER BY '. $sort);
+ $courses = get_records_sql('SELECT '. $fields .' FROM '. $selectsql .' ORDER BY '. $sort);
if ($courses and (!$hideallinvisible) and (!$showallinvisible)) { // For ordinary users we need to check visibility
foreach ($courses as $key => $course) {