Skip to content

Commit 635aa34

Browse files
Fix issue with # as value in config + php 8.1 test bug (hestiacp#2244)
* Allow the use of # as value in config files * Fix bug in test * Adjust space. Co-authored-by: Raphael Schneeberger <rs@scit.ch>
1 parent 8d2d7ae commit 635aa34

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

func/main.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,7 +1347,7 @@ source_conf(){
13471347
while IFS='= ' read -r lhs rhs
13481348
do
13491349
if [[ ! $lhs =~ ^\ *# && -n $lhs ]]; then
1350-
rhs="${rhs%%\#*}" # Del in line right comments
1350+
rhs="${rhs%%^\#*}" # Del in line right comments
13511351
rhs="${rhs%%*( )}" # Del trailing spaces
13521352
rhs="${rhs%\'*}" # Del opening string quotes
13531353
rhs="${rhs#\'*}" # Del closing string quotes
@@ -1376,4 +1376,4 @@ change_sys_value(){
13761376
else
13771377
sed -i "s|^$1=.*|$1='$2'|g" "$HESTIA/conf/hestia.conf"
13781378
fi
1379-
}
1379+
}

test/test.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -966,7 +966,7 @@ function check_ip_not_banned(){
966966
skip "PHP ${test_phpver} not installed"
967967
fi
968968

969-
run v-change-web-domain-backend-tpl $user $multi_domain 'PHP-8_0' 'yes'
969+
run v-change-web-domain-backend-tpl $user $multi_domain 'PHP-8_1' 'yes'
970970
assert_success
971971
refute_output
972972

0 commit comments

Comments
 (0)