Merge branch '4.0' into 'main'

Author: thorsten

phpmyfaq/src/phpMyFAQ/Instance/Database/Mysqli.php

@@ -186,6 +186,7 @@ class Mysqli extends Database implements Driver
             date_end VARCHAR(14) NOT NULL DEFAULT \'99991231235959\',
             created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
             notes text DEFAULT NULL,
+            sticky_order int(10) DEFAULT NULL,
             PRIMARY KEY (id, lang, solution_id, revision_id)) 
             DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci ENGINE = InnoDB',
 

phpmyfaq/src/phpMyFAQ/Instance/Database/Pgsql.php

@@ -187,6 +187,7 @@ class Pgsql extends Database implements Driver
             date_end VARCHAR(14) NOT NULL DEFAULT \'99991231235959\',
             created TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
             notes text DEFAULT NULL,
+            sticky_order INTEGER DEFAULT NULL,
             PRIMARY KEY (id, lang, solution_id, revision_id))',
 
         'faqdata_group' => 'CREATE TABLE %sfaqdata_group (