diff --git a/.github/workflows/test_mysql.yml b/.github/workflows/test_mysql.yml index a53aab33..ff1b3a48 100644 --- a/.github/workflows/test_mysql.yml +++ b/.github/workflows/test_mysql.yml @@ -23,6 +23,7 @@ jobs: - 'mariadb-11.1' - 'mariadb-11.2' - 'mariadb-11.3' + - 'mariadb-11.4' - '8.0' - '8.2' - '8.3' @@ -63,4 +64,4 @@ jobs: - name: Output logs if: failure() - run: cat _cache/test/*.log && cat _tests/_output/email/*.txt + run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/ diff --git a/.github/workflows/test_postgres.yml b/.github/workflows/test_postgres.yml index 13ca7fb6..c7f5e8e3 100644 --- a/.github/workflows/test_postgres.yml +++ b/.github/workflows/test_postgres.yml @@ -48,4 +48,4 @@ jobs: - name: Output logs if: failure() - run: cat _cache/test/*.log && cat _tests/_output/email/*.txt + run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/ diff --git a/.github/workflows/test_sqlite.yml b/.github/workflows/test_sqlite.yml index c6fe9ad1..87417575 100644 --- a/.github/workflows/test_sqlite.yml +++ b/.github/workflows/test_sqlite.yml @@ -40,4 +40,4 @@ jobs: - name: Output logs if: failure() - run: cat _cache/test/*.log && cat _tests/_output/email/*.txt + run: cat _cache/test/*.log && cat _tests/_output/email/*.txt && /home/runner/work/s2/s2/_tests/_output/ diff --git a/_admin/tags.php b/_admin/tags.php index ccffc9cd..283d2762 100644 --- a/_admin/tags.php +++ b/_admin/tags.php @@ -148,7 +148,7 @@ function s2_output_tag_form ($tag, $modify_time) - + @@ -169,7 +169,7 @@ function s2_output_tag_form ($tag, $modify_time)
- +
diff --git a/_include/src/Model/Installer.php b/_include/src/Model/Installer.php index 07194119..487ef443 100644 --- a/_include/src/Model/Installer.php +++ b/_include/src/Model/Installer.php @@ -27,7 +27,7 @@ public function createTables(): void $schema = array( 'FIELDS' => array( 'name' => array( - 'datatype' => 'VARCHAR(255)', + 'datatype' => 'VARCHAR(191)', 'allow_null' => false, 'default' => '\'\'' ), @@ -270,7 +270,7 @@ public function createTables(): void 'allow_null' => false ), 'name' => array( - 'datatype' => 'VARCHAR(255)', + 'datatype' => 'VARCHAR(191)', 'allow_null' => false, 'default' => '\'\'' ), @@ -284,7 +284,7 @@ public function createTables(): void 'default' => '0' ), 'url' => array( - 'datatype' => 'VARCHAR(255)', + 'datatype' => 'VARCHAR(191)', 'allow_null' => false, 'default' => '\'\'' ), @@ -344,7 +344,7 @@ public function createTables(): void 'default' => '0' ), 'login' => array( - 'datatype' => 'VARCHAR(200)', + 'datatype' => 'VARCHAR(191)', 'allow_null' => true ), 'ip' => array( @@ -379,7 +379,7 @@ public function createTables(): void 'allow_null' => false ), 'login' => array( - 'datatype' => 'VARCHAR(200)', + 'datatype' => 'VARCHAR(191)', 'allow_null' => false, 'default' => '\'\'' ),