diff --git a/course/external.php b/course/external.php
index d5476dc2f60..660f6f81d7f 100644
--- a/course/external.php
+++ b/course/external.php
@@ -83,21 +83,21 @@ final class course_external extends moodle_external {
      * @subreturn integer $return:course->enablecompletion
      */
     static function get_courses($params) {
-        global $USER;
+        global $USER, $DB;
         if (has_capability('moodle/course:participate', get_context_instance(CONTEXT_SYSTEM))) {
             $courses = array();
             foreach ($params as $param) {
                 $course = new stdClass();
                 if (key_exists('id', $param)) {
                     $param['id'] = clean_param($param['id'], PARAM_INT);
-                    $course = get_course_by_id($param['id']);
+                    $course = $DB->get_record('course', array('id'=>$param['id']));
 
                 } else if (key_exists('idnumber', $param)) {
                     $param['idnumber'] = clean_param($param['idnumber'], PARAM_ALPHANUM);
-                    $course = get_course_by_idnumber($param['idnumber']);
+                    $course = $DB->get_record('course', array('idnumber'=>$param['idnumber']));
                 } else if (key_exists('shortname', $param)) {
                     $param['shortname'] = clean_param($param['shortname'], PARAM_ALPHANUM);
-                    $course = get_course_by_shortname($param['shortname']);
+                    $course = $DB->get_record('course', array('shortname'=>$param['shortname']));
                 }
                 if (!empty($course)) {
                     $returnedcourse = new stdClass();
diff --git a/course/lib.php b/course/lib.php
index 7c8f5444e91..6aa9819da1b 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -356,7 +356,7 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
         get_string('info')
     );
     $table->data = array();
-    
+
     if ($course->id == SITEID) {
         array_unshift($table->align, 'left');
         array_unshift($table->head, get_string('course'));
@@ -400,9 +400,9 @@ function print_log($course, $user=0, $date=0, $order="l.time ASC", $page=0, $per
                 $row[] = "<a href=\"{$CFG->wwwroot}/course/view.php?id={$log->course}\">". format_string($courses[$log->course])."</a>";
             }
         }
-        
+
         $row[] = userdate($log->time, '%a').' '.userdate($log->time, $strftimedatetime);
-        
+
         $link = new moodle_url("/iplookup/index.php?ip=$log->ip&user=$log->userid");
         $row[] = $OUTPUT->action_link($link, $log->ip, new popup_action('click', $link, 'iplookup', array('height' => 440, 'width' => 700)));
 
@@ -3296,7 +3296,7 @@ function get_section_name(stdClass $course, stdClass $section) {
 
 /**
  * Gets the generic section name for a courses section.
- * 
+ *
  * @param string $format Course format ID e.g. 'weeks' $course->format
  * @param stdClass $section Section object from database
  * @return Display name that the course format prefers, e.g. "Week 2"
@@ -3539,21 +3539,6 @@ function update_course($data) {
     return false;
 }
 
-function get_course_by_id ($id) {
-    global $DB;
-    return $DB->get_record('course', array('id' => $id));
-}
-
-function get_course_by_shortname ($shortname) {
-    global $DB;
-    return $DB->get_record('course', array('shortname' => $shortname));
-}
-
-function get_course_by_idnumber ($idnumber) {
-    global $DB;
-    return $DB->get_record('course', array('idnumber' => $idnumber));
-}
-
 /**
  * TODO: Average number of participants (in non-empty courses)
  * @return integer
diff --git a/mod/wiki/comments.php b/mod/wiki/comments.php
index 6469438dd4d..9abd552655b 100644
--- a/mod/wiki/comments.php
+++ b/mod/wiki/comments.php
@@ -55,9 +55,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
 
diff --git a/mod/wiki/create.php b/mod/wiki/create.php
index f6873b2778c..690bb03c16e 100644
--- a/mod/wiki/create.php
+++ b/mod/wiki/create.php
@@ -62,9 +62,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemoduleid', 'wiki');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('invalidcourseid', 'wiki');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
 
diff --git a/mod/wiki/diff.php b/mod/wiki/diff.php
index 6e89f3d7def..28eb218bb10 100644
--- a/mod/wiki/diff.php
+++ b/mod/wiki/diff.php
@@ -60,9 +60,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 if ($compare >= $comparewith) {
     print_error("A page version can only be compared with an older version.");
diff --git a/mod/wiki/edit.php b/mod/wiki/edit.php
index a9554ef7c67..92f2f279a45 100644
--- a/mod/wiki/edit.php
+++ b/mod/wiki/edit.php
@@ -62,9 +62,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');
diff --git a/mod/wiki/editcomments.php b/mod/wiki/editcomments.php
index 061a2ff7ef8..562bcb53636 100644
--- a/mod/wiki/editcomments.php
+++ b/mod/wiki/editcomments.php
@@ -48,9 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
diff --git a/mod/wiki/history.php b/mod/wiki/history.php
index f4929082888..6ff082a975b 100644
--- a/mod/wiki/history.php
+++ b/mod/wiki/history.php
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
 add_to_log($course->id, 'wiki', 'history', 'history.php?id='.$cm->id, $wiki->id);
diff --git a/mod/wiki/instancecomments.php b/mod/wiki/instancecomments.php
index 17456aeedc8..71587c6c9e5 100644
--- a/mod/wiki/instancecomments.php
+++ b/mod/wiki/instancecomments.php
@@ -53,9 +53,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
diff --git a/mod/wiki/lock.php b/mod/wiki/lock.php
index 5c982897f58..a928585806c 100644
--- a/mod/wiki/lock.php
+++ b/mod/wiki/lock.php
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');
diff --git a/mod/wiki/map.php b/mod/wiki/map.php
index 58cffe0c36d..3779f05b417 100644
--- a/mod/wiki/map.php
+++ b/mod/wiki/map.php
@@ -48,9 +48,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
diff --git a/mod/wiki/overridelocks.php b/mod/wiki/overridelocks.php
index b40a233a23d..359bb878dff 100644
--- a/mod/wiki/overridelocks.php
+++ b/mod/wiki/overridelocks.php
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 if (!empty($section) && !$sectioncontent = wiki_get_section_page($page, $section)) {
     print_error('invalidsection', 'wiki');
diff --git a/mod/wiki/prettyview.php b/mod/wiki/prettyview.php
index c6a78e84def..039f69bb031 100644
--- a/mod/wiki/prettyview.php
+++ b/mod/wiki/prettyview.php
@@ -46,9 +46,7 @@ if (!$subwiki = wiki_get_subwiki($page->subwikiid)) {
 if (!$cm = get_coursemodule_from_instance("wiki", $subwiki->wikiid)) {
     print_error('invalidcoursemodule');
 }
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 if (!$wiki = wiki_get_wiki($subwiki->wikiid)) {
     print_error('incorrectwikiid', 'wiki');
 }
diff --git a/mod/wiki/restoreversion.php b/mod/wiki/restoreversion.php
index 2664fbeb70a..6ee17dd3ccd 100644
--- a/mod/wiki/restoreversion.php
+++ b/mod/wiki/restoreversion.php
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
 
diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index 7397a379861..d70b8840678 100644
--- a/mod/wiki/view.php
+++ b/mod/wiki/view.php
@@ -66,9 +66,7 @@ if ($id) {
     }
 
     // Checking course instance
-    if (!$course = get_course_by_id($cm->course)) {
-        print_error('coursemisconf');
-    }
+    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
     // Checking wiki instance
     if (!$wiki = wiki_get_wiki($cm->instance)) {
@@ -136,9 +134,7 @@ if ($id) {
     }
 
     // Checking course instance
-    if (!$course = get_course_by_id($cm->course)) {
-        print_error('coursemisconf');
-    }
+    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
     /*
      * Case 2:
@@ -237,9 +233,7 @@ if ($id) {
     //    }
     //
     //    // Checking course instance
-    //    if (!$course = get_course_by_id($wiki->course)) {
-    //        print_error('coursemisconf');
-    //    }
+    //    $course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
     //
     //    // Checking course module instance
     //    if (!$cm = get_coursemodule_from_instance("wiki", $wiki->id, $course->id)) {
diff --git a/mod/wiki/viewversion.php b/mod/wiki/viewversion.php
index 0bffff2ad87..b62bdef47c2 100644
--- a/mod/wiki/viewversion.php
+++ b/mod/wiki/viewversion.php
@@ -56,9 +56,7 @@ if (!$cm = get_coursemodule_from_instance('wiki', $wiki->id)) {
     print_error('invalidcoursemodule');
 }
 
-if (!$course = get_course_by_id($cm->course)) {
-    print_error('coursemisconf');
-}
+$course = $DB->get_record('course', array('id'=>$cm->course), '*', MUST_EXIST);
 
 require_course_login($course->id, true, $cm);
 add_to_log($course->id, "wiki", "history", "history.php?id=$cm->id", "$wiki->id");