From f898b0675c63f47e824eb56eedd7c8d6f492e378 Mon Sep 17 00:00:00 2001
From: Tim Schroeder <t.schroeder@itc.rwth-aachen.de>
Date: Wed, 12 Aug 2020 20:35:41 +0200
Subject: [PATCH] fixed order of upgrade steps

This would lead to a downgrade error when attempting to upgrade from
a very old version.
---
 db/upgrade.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/db/upgrade.php b/db/upgrade.php
index fef5393..c3e680c 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -470,21 +470,6 @@ function xmldb_pdfannotator_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018111901, 'pdfannotator');
     }
 
-    if ($oldversion < 2018112203) {
-
-        // Define field solved to be added to pdfannotator_comments.
-        $table = new xmldb_table('pdfannotator_comments');
-        $field = new xmldb_field('solved', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'seen');
-
-        // Conditionally launch add field solved.
-        if (!$dbman->field_exists($table, $field)) {
-            $dbman->add_field($table, $field);
-        }
-
-        // Pdfannotator savepoint reached.
-        upgrade_mod_savepoint(true, 2018112203, 'pdfannotator');
-    }
-
     if ($oldversion < 2018112100) {
 
         // Define field modifiedby to be added to pdfannotator_annotations.
@@ -518,6 +503,21 @@ function xmldb_pdfannotator_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2018112100, 'pdfannotator');
     }
 
+    if ($oldversion < 2018112203) {
+
+        // Define field solved to be added to pdfannotator_comments.
+        $table = new xmldb_table('pdfannotator_comments');
+        $field = new xmldb_field('solved', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, '0', 'seen');
+
+        // Conditionally launch add field solved.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Pdfannotator savepoint reached.
+        upgrade_mod_savepoint(true, 2018112203, 'pdfannotator');
+    }
+
     if ($oldversion < 2019013000) {
 
         // Rename field seen on table pdfannotator_comments to NEWNAMEGOESHERE.
-- 
GitLab