From f1882a76acd81c64cbe2fbaf6e9d19ddbd6cb4b8 Mon Sep 17 00:00:00 2001
From: Artem Andreev <andreev.artem@gmail.com>
Date: Fri, 9 Sep 2011 16:56:58 +0400
Subject: [PATCH] MDL-29296 fix: now Continue button on last page of upgraded lesson open lesson end page.

---
 mod/lesson/locallib.php |   17 ++++++-----------
 mod/lesson/view.php     |    4 +---
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/mod/lesson/locallib.php b/mod/lesson/locallib.php
index aa41df2..defc992 100644
--- a/mod/lesson/locallib.php
+++ b/mod/lesson/locallib.php
@@ -1117,7 +1117,7 @@ class lesson extends lesson_base {
     }
 
      /**
-     * Gets the next page to display after the one that is provided.
+     * Gets the next page id to display after the one that is provided.
      * @param int $nextpageid
      * @return bool
      */
@@ -1148,19 +1148,19 @@ class lesson extends lesson_base {
                 if ($this->properties->maxpages) {
                     // check number of pages viewed (in the lesson)
                     if ($DB->count_records("lesson_attempts", array("lessonid"=>$this->properties->id, "userid"=>$USER->id, "retry"=>$nretakes)) >= $this->properties->maxpages) {
-                        return false;
+                        return LESSON_EOL;
                     }
                 }
-                return $nextpage;
+                return $nextpage->id;
             }
         }
         // In a normal lesson mode
         foreach ($allpages as $nextpage) {
             if ((int)$nextpage->id===(int)$nextpageid) {
-                return $nextpage;
+                return $nextpage->id;
             }
         }
-        return false;
+        return LESSON_EOL;
     }
 
     /**
@@ -1986,12 +1986,7 @@ abstract class lesson_page extends lesson_base {
             if ($result->newpageid == 0) {
                 $result->newpageid = $this->properties->id;
             } elseif ($result->newpageid == LESSON_NEXTPAGE) {
-                $nextpage = $this->lesson->get_next_page($this->properties->nextpageid);
-                if ($nextpage === false) {
-                    $result->newpageid = LESSON_EOL;
-                } else {
-                    $result->newpageid = $nextpage->id;
-                }
+                $result->newpageid = $this->lesson->get_next_page($this->properties->nextpageid);
             }
 
             // Determine default feedback if necessary
diff --git a/mod/lesson/view.php b/mod/lesson/view.php
index 855b755..6091628 100644
--- a/mod/lesson/view.php
+++ b/mod/lesson/view.php
@@ -375,9 +375,7 @@ if ($pageid != LESSON_EOL) {
         $data->id = $PAGE->cm->id;
         $data->pageid = $page->id;
         $data->newpageid = LESSON_NEXTPAGE;
-        if ($nextpage = $lesson->get_next_page($page->nextpageid)) {
-            $data->newpageid = $nextpage->id;
-        }
+        $data->newpageid = $lesson->get_next_page($page->nextpageid);
 
         $customdata = array(
             'title'     => $page->title,
-- 
1.7.3.1.msysgit.0