Index: backup/restorelib.php
===================================================================
--- backup/restorelib.php	(revision 4383)
+++ backup/restorelib.php	(working copy)
@@ -8092,24 +8092,6 @@
             }
         }
 
-        //Now, if all is OK, adjust inter-activity links
-        if ($status) {
-            if (!defined('RESTORE_SILENTLY')) {
-                echo "<li>".get_string("decodinginternallinks");
-            }
-            if (!$status = restore_decode_content_links($restore)) {
-                if (!defined('RESTORE_SILENTLY')) {
-                    notify("Could not decode content links!");
-                } else {
-                    $errorstr = "Could not decode content links!";
-                    return false;
-                }
-            }
-            if (!defined('RESTORE_SILENTLY')) {
-                echo '</li>';
-            }
-        }
-
         //Now, with backup files prior to version 2005041100,
         //convert all the wiki texts in the course to markdown
         if ($status && $restore->backup_version < 2005041100) {
@@ -8173,6 +8155,24 @@
                 grade_grab_course_grades($restore->course_id);
         }
 
+        //Now, if all is OK, adjust inter-activity links
+        if ($status) {
+            if (!defined('RESTORE_SILENTLY')) {
+                echo "<li>".get_string("decodinginternallinks");
+            }
+            if (!$status = restore_decode_content_links($restore)) {
+                if (!defined('RESTORE_SILENTLY')) {
+                    notify("Could not decode content links!");
+                } else {
+                    $errorstr = "Could not decode content links!";
+                    return false;
+                }
+            }
+            if (!defined('RESTORE_SILENTLY')) {
+                echo '</li>';
+            }
+        }
+
         /*******************************************************************************
          ************* Restore of Roles and Capabilities happens here ******************
          *******************************************************************************/