diff --git a/4dev/checking/phpunit.sh b/4dev/checking/phpunit.sh
index bbd562be..c61c0c7d 100755
--- a/4dev/checking/phpunit.sh
+++ b/4dev/checking/phpunit.sh
@@ -16,6 +16,7 @@ if [ ! -z "${1}" ]; then
"7.4") php_bin="/usr/bin/php7.4 "; ;;
"8.0") php_bin="/usr/bin/php8.0 "; ;;
"8.1") php_bin="/usr/bin/php8.1 "; ;;
+ "8.2") php_bin="/usr/bin/php8.2 "; ;;
*) echo "Not support PHP: ${1}"; exit; ;;
esac;
fi;
@@ -25,6 +26,7 @@ if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then
"7.4") php_bin="/usr/bin/php7.4 "; ;;
"8.0") php_bin="/usr/bin/php8.0 "; ;;
"8.1") php_bin="/usr/bin/php8.1 "; ;;
+ "8.2") php_bin="/usr/bin/php8.2 "; ;;
*) echo "Not support PHP: ${1}"; exit; ;;
esac;
fi;
diff --git a/4dev/sync/sync_template.sh b/4dev/sync/sync_template.sh
index 8e6aeab2..1d8b4de1 100755
--- a/4dev/sync/sync_template.sh
+++ b/4dev/sync/sync_template.sh
@@ -18,6 +18,7 @@ rm -f $tmpf_web;
echo ".*.swp" >> $tmpf_web;
echo "._*" >> $tmpf_web;
echo ".DS_Store" >> $tmpf_web;
+echo ".user.ini" >> $tmpf_web;
echo ".svn" >> $tmpf_web;
echo ".svnignore" >> $tmpf_web;
echo ".git" >> $tmpf_web;
diff --git a/www/includes/templates/admin/edit_body.tpl b/www/includes/templates/admin/edit_body.tpl
index 0486b6a7..880aa115 100644
--- a/www/includes/templates/admin/edit_body.tpl
+++ b/www/includes/templates/admin/edit_body.tpl
@@ -8,6 +8,7 @@
********************************************************************
*}
+
{$HTML_TITLE}
diff --git a/www/includes/templates/admin/main_body.tpl b/www/includes/templates/admin/main_body.tpl
index 7a109118..f453c064 100644
--- a/www/includes/templates/admin/main_body.tpl
+++ b/www/includes/templates/admin/main_body.tpl
@@ -8,6 +8,7 @@
********************************************************************
*}
+
{$HTML_TITLE}
diff --git a/www/includes/templates/admin/main_body4.tpl b/www/includes/templates/admin/main_body4.tpl
index 25b52eed..89500600 100644
--- a/www/includes/templates/admin/main_body4.tpl
+++ b/www/includes/templates/admin/main_body4.tpl
@@ -8,6 +8,7 @@
********************************************************************
*}
+
{$HTML_TITLE}
diff --git a/www/layout/admin/javascript/edit.jq.js b/www/layout/admin/javascript/edit.jq.js
index fcd48d88..50bef9aa 100644
--- a/www/layout/admin/javascript/edit.jq.js
+++ b/www/layout/admin/javascript/edit.jq.js
@@ -1014,8 +1014,12 @@ function phfo(tree)
} else if (tree.content) {
content.push(tree.content);
}
- // if not input close
- if (tree.tag != 'input') {
+ // if not input, image or br, then close
+ if (
+ tree.tag != 'input' ||
+ tree.tag != 'img' ||
+ tree.tag != 'br'
+ ) {
content.push('');
}
// combine to string
diff --git a/www/psalm.xml b/www/psalm.xml
index 8a07f882..c5484899 100644
--- a/www/psalm.xml
+++ b/www/psalm.xml
@@ -28,7 +28,6 @@
-