Merge 18a63b6d7d into 30ee379576

Merge branch '3.3.x'
Merge pull request #6836 from rxu/ticket/17533
2025-07-26 03:48:53 +00:00 · 2025-07-07 15:41:47 -04:00 · 2025-07-07 15:35:55 +00:00 · 2025-07-07 17:35:37 +02:00 · 2025-07-07 11:02:30 +07:00 · 2022-04-13 19:25:55 +01:00
2 changed files with 5 additions and 2 deletions
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@ -336,7 +336,10 @@ class mysqli extends \phpbb\db\driver\mysql_base
 	*/
 	function sql_escape($msg)
 	{
-		return @mysqli_real_escape_string($this->db_connect_id, $msg);
+		return @mysqli_real_escape_string(
+			$this->db_connect_id,
+			utf8_encode_ucr($msg)
+		);
 	}

 	/**
--- a/phpBB/phpbb/db/migrator.php
+++ b/phpBB/phpbb/db/migrator.php
@ -575,7 +575,7 @@ class migrator
 				$state['migration_data_state']['_total_time'] : 0.0;
 			$elapsed_time = microtime(true);

-			$steps = array_merge($this->helper->reverse_update_data($migration->update_data()), $migration->revert_data());
+			$steps = $migration->revert_data() ?: $this->helper->reverse_update_data($migration->update_data());
 			$result = $this->process_data_step($steps, $state['migration_data_state']);

 			$elapsed_time = microtime(true) - $elapsed_time;
Author	SHA1	Message	Date
lionel-rowe	2726ed9738	Merge `18a63b6d7d` into `30ee379576`	2025-07-07 15:41:47 -04:00
Marc Alexander	30ee379576	Merge branch '3.3.x'	2025-07-07 15:35:55 +00:00
Marc Alexander	081f2391cb	Merge pull request #6836 from rxu/ticket/17533 [ticket/17533] Fix reverting migrations logic	2025-07-07 17:35:37 +02:00
rxu	0b242b9608	[ticket/17533] Fix reverting migrations logic Basically, prefer revert_data() if exists. PHPBB-17533	2025-07-07 11:02:30 +07:00
lionel-rowe	18a63b6d7d	[ticket/16985] Fix MYSQLi bug - Incorrect string value for non-BMP chars PHPBB3-16985	2022-04-13 19:25:55 +01:00