Merge branch '20.0' of [email protected]:Dolibarr/dolibarr.git into develop

Dolibarr · Sep 30, 2024 · 2c518be · 2c518be
2 parents f1d220b + f36dc40
commit 2c518be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -169,7 +169,7 @@
 } elseif ($action == 'reopen' && $permissiontoadd && getDolGlobalString('ACCOUNTING_CAN_REOPEN_CLOSED_PERIOD')) {
 	$result = $object->fetch($id);
 
-	$object->status = GETPOST('status', 'int');
+	$object->status = GETPOSTINT('status');
 	$result = $object->update($user);
 
 	if ($result > 0) {

diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
@@ -53,11 +53,11 @@
 	$db->query($sql);
 }
 if ($action == 'convertutf8') {
-	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
 	$db->query($sql);
 }
 if ($action == 'convertutf8mb4') {
-	$sql = "ALTER TABLE ".$db->sanitize($table)." CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
+	$sql = "ALTER TABLE ".$db->sanitize($table)." CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci";
 	$db->query($sql);
 }
 if ($action == 'convertdynamic') {

diff --git a/htdocs/core/ajax/ziptown.php b/htdocs/core/ajax/ziptown.php
@@ -143,7 +143,7 @@
 	top_httphead('text/html');
 
 	$formcompany = new FormCompany($db);
-	print $formcompany->select_state(GETPOSTINT('selected', 1), GETPOSTINT('country_codeid', 1), GETPOSTINT('htmlname', 1), GETPOSTINT('morecss', 1));
+	print $formcompany->select_state(GETPOSTINT('selected', 1), GETPOSTINT('country_codeid', 1), GETPOST('htmlname', 'alpha', 1), GETPOST('morecss', 'alpha', 1));
 }
 
 $db->close();