Ensure links of the form /mod/quiz/view.php?q=332 are backed up and restored correctly.

diff --git a/mod/quiz/backuplib.php b/mod/quiz/backuplib.php
index adf32597f28eac116cf5fd579027e8e5491a2ad4..fe289d3393c8185b09e05b1ffab491d1476fe90d 100644 (file)
--- a/mod/quiz/backuplib.php
+++ b/mod/quiz/backuplib.php
@@ -584,6 +584,10 @@
         $buscar="/(".$base."\/mod\/quiz\/view.php\?id\=)([0-9]+)/";
         $result= preg_replace($buscar,'$@QUIZVIEWBYID*$2@$',$result);
 
+        //Link to quiz view by quizid
+        $buscar="/(".$base."\/mod\/quiz\/view.php\?q\=)([0-9]+)/";
+        $result= preg_replace($buscar,'$@QUIZVIEWBYQ*$2@$',$result);
+
         return $result;
     }
 

diff --git a/mod/quiz/restorelib.php b/mod/quiz/restorelib.php
index 80cf0c3708b31f335b3137087f6454fdd0c0cc40..758e2b2b186593946323d5fc3751096be788e86c 100644 (file)
--- a/mod/quiz/restorelib.php
+++ b/mod/quiz/restorelib.php
@@ -502,7 +502,6 @@
         }
 
         //Link to quiz view by moduleid
-
         $searchstring='/\$@(QUIZVIEWBYID)\*([0-9]+)@\$/';
         //We look for it
         preg_match_all($searchstring,$result,$foundset);
@@ -526,6 +525,30 @@
             }
         }
 
+        //Link to quiz view by quizid
+        $searchstring='/\$@(QUIZVIEWBYQ)\*([0-9]+)@\$/';
+        //We look for it
+        preg_match_all($searchstring,$result,$foundset);
+        //If found, then we are going to look for its new id (in backup tables)
+        if ($foundset[0]) {
+            //print_object($foundset);                                     //Debug
+            //Iterate over foundset[2]. They are the old_ids
+            foreach($foundset[2] as $old_id) {
+                //We get the needed variables here (course_modules id)
+                $rec = backup_getid($restore->backup_unique_code,'quiz',$old_id);
+                //Personalize the searchstring
+                $searchstring='/\$@(QUIZVIEWBYQ)\*('.$old_id.')@\$/';
+                //If it is a link to this course, update the link to its new location
+                if($rec->new_id) {
+                    //Now replace it
+                    $result= preg_replace($searchstring,$CFG->wwwroot.'/mod/quiz/view.php?q='.$rec->new_id,$result);
+                } else {
+                    //It's a foreign link so leave it as original
+                    $result= preg_replace($searchstring,$restore->original_wwwroot.'/mod/quiz/view.php?q='.$old_id,$result);
+                }
+            }
+        }
+
         return $result;
     }