Merge branch 'release-3.0' of github.com:SimpleMachines/SMF into reactions

Author: Oldiesmann

Sources/Db/APIs/PostgreSQL.php

@@ -411,21 +411,13 @@ public function insert(string $method, string $table, array $columns, array $dat
 
 		// PostgreSQL doesn't support replace: we implement a MySQL-compatible behavior instead
 		if ($method == 'replace' || $method == 'ignore') {
-			$key_str = '';
+			$key_str = implode(',', $keys);
 			$col_str = '';
-
 			$count = 0;
-			$count_pk = 0;
 
+			// Make a list of the non-pk fields.
 			foreach ($columns as $columnName => $type) {
-				// Check pk field.
-				if (\in_array($columnName, $keys)) {
-					$key_str .= ($count_pk > 0 ? ',' : '');
-					$key_str .= $columnName;
-					$count_pk++;
-				}
-				// Normal field.
-				elseif ($method == 'replace') {
+				if (!\in_array($columnName, $keys) && ($method == 'replace')) {
 					$col_str .= ($count > 0 ? ',' : '');
 					$col_str .= $columnName . ' = EXCLUDED.' . $columnName;
 					$count++;

Sources/Db/Schema/Table.php

@@ -547,7 +547,7 @@ public function populate(bool $replace = false): int
 			table: '{db_prefix}' . $this->name,
 			columns: Db::$db->getTypeIndicators('{db_prefix}' . $this->name, reset($this->initial_data)),
 			data: array_map(fn($row) => array_values($row), $this->initial_data),
-			keys: isset($auto_col) ? [$auto_col] : [],
+			keys: isset($auto_col) ? [$auto_col] : array_column($this->indexes['primary']->columns, 'name'),
 			returnmode: $returnmode,
 		);
 

Sources/Utils.php

@@ -1979,11 +1979,13 @@ public static function emitFile(\ArrayAccess|array $file, bool $show_thumb = fal
 		// Provide a plain ASCII name for the sake of old browsers.
 		if (preg_match('/[\x{80}-\x{10FFFF}]/u', $file['filename'])) {
 			$file['asciiname'] = Localization\AsciiTransliterator::toAscii($file['filename'], '?');
-		}
 
-		// Replace ASCII names like ??????.jpg with something more unique.
-		if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.')) {
-			$file['asciiname'] = md5($file['filename']) . substr($file['asciiname'], strpos($file['asciiname'], '.'));
+			// Replace ASCII names like ??????.jpg with something more unique.
+			if (strspn($file['asciiname'], '?') === strpos($file['asciiname'], '.')) {
+				$file['asciiname'] = md5($file['filename']) . substr($file['asciiname'], strpos($file['asciiname'], '.'));
+			}
+		} else {
+			$file['asciiname'] = $file['filename'];
 		}
 
 		// Clear any output that was made before now.