From 7e0073f4a3b005f40771638de8a68d3a48c9f746 Mon Sep 17 00:00:00 2001 From: Michael Kaufmann Date: Wed, 15 Nov 2023 22:53:23 +0100 Subject: [PATCH] on building nightly, of course also install composer dependencies Signed-off-by: Michael Kaufmann --- .github/workflows/build-mariadb.yml | 5 +++++ lib/Froxlor/Validate/Form/Data.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-mariadb.yml b/.github/workflows/build-mariadb.yml index c1b71cffb7..ed49822356 100644 --- a/.github/workflows/build-mariadb.yml +++ b/.github/workflows/build-mariadb.yml @@ -64,11 +64,16 @@ jobs: with: php-version: '7.4' tools: composer:v2 + extensions: mbstring, xml, ctype, pdo_mysql, mysql, curl, json, zip, session, filter, posix, openssl, fileinfo, bcmath, gmp, gnupg + + - name: Install composer dependencies + run: composer install --no-dev - name: Install Node.js uses: actions/setup-node@v3 with: node-version: '20.x' + - name: Install npm dependencies run: npm install diff --git a/lib/Froxlor/Validate/Form/Data.php b/lib/Froxlor/Validate/Form/Data.php index 377c5bff3f..6fdabed877 100644 --- a/lib/Froxlor/Validate/Form/Data.php +++ b/lib/Froxlor/Validate/Form/Data.php @@ -259,7 +259,7 @@ public static function validateFormFieldTextarea($fieldname, $fielddata, $newfie if (preg_match($fielddata['string_regexp'], $newfieldvalue)) { $returnvalue = true; } - } else if (preg_match('/^[^\0]*$/', $newfieldvalue)) { + } elseif (preg_match('/^[^\0]*$/', $newfieldvalue)) { $returnvalue = true; }