From: tjhunt <tjhunt>
Date: Thu, 6 Dec 2007 11:38:53 +0000 (+0000)
Subject: MDL-12448 - Fix page_generic_activity->init_full() to use get_coursemodule_from_insta... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0d7c3b78cde8e6ef312bfb3fefc4fe8e34bfb81a;p=moodle.git

MDL-12448 - Fix page_generic_activity->init_full() to use get_coursemodule_from_instance(). Merged from MOODLE_19_STABLE.
---

diff --git a/lib/pagelib.php b/lib/pagelib.php
index 159494a053..765c979927 100644
--- a/lib/pagelib.php
+++ b/lib/pagelib.php
@@ -589,9 +589,7 @@ class page_generic_activity extends page_base {
         if(empty($this->activityname)) {
             error('Page object derived from page_generic_activity but did not define $this->activityname');
         }
-        $module = get_record('modules', 'name', $this->activityname);
-        $this->modulerecord = get_record('course_modules', 'module', $module->id, 'instance', $this->id);
-        if(empty($this->modulerecord)) {
+        if (!$this->modulerecord = get_coursemodule_from_instance($this->activityname, $this->id)) {
             error('Cannot fully initialize page: invalid '.$this->activityname.' instance id '. $this->id);
         }
         $this->courserecord = get_record('course', 'id', $this->modulerecord->course);