[2.1.5]: 2.1.5 & 2.1.6 package tweaks

[sbulen]

Basic Information

If you use a patch to upgrade from 2.1.4 to 2.1.5, three files are out of sync with GitHub v2.1.5:

• Subs-Timezones.php
• Timezones.english.php
• Who.php

If you then use a patch to upgrade from 2.1.5 to 2.1.6, they remain out of sync with GitHub v2.1.6.

2.1.6 installs/upgrades appear to be in sync with GitHub v2.1.6, so they're out of sync with the patches.

2.1.5 Beta 17 didn't have this issue. It appears some tweaks slipped into (or out of?) the later versions of the 2.1.5 patches.

Just reporting here for awareness.

Not critical files. My first thought is to apply the changes as optional in future 2.1.7 patch.

Steps to reproduce

1. Apply patches & compare source to the corresponding GitHub tag.

Expected result

No response

Actual result

No response

Version/Git revision

2.1.6

Database Engine

All

Database Version

8.4.4

PHP Version

8.4.5

Logs

Additional Information

No response

[jdarwood007]

Confirmed.. From what I see, the differences are not much to worry about and can be corrected in .7 with a ignore error patch.

Diff, smf21git is directly off git repo (not updated since .6 was released) and smf21mod was patched via pacman.

diff -ur -x '*~' smf21git/Sources/Who.php smf21mod/Sources/Who.php
--- smf21git/Sources/Who.php	2025-06-25 14:52:08.206672829 -0700
+++ smf21mod/Sources/Who.php	2025-06-25 19:56:30.326398095 -0700
@@ -614,6 +614,7 @@
 						'Jon "Sesquipedalian" Stovell',
 						// Developers
 						'John "live627" Rayes',
+						'Oscar "Ozp" Rydhé',

 						// Former Developers
 						'Aaron van Geffen',
@@ -632,7 +633,6 @@
 						'Michael "Oldiesmann" Eshom',
 						'Michael "Thantos" Miller',
 						'Norv',
-						'Oscar "Ozp" Rydhé',
 						'Peter "Arantor" Spicer',
 						'Selman "[SiNaN]" Eser',
 						'Shawn Bulen',
@@ -652,6 +652,7 @@
 						// Support Specialists
 						'Doug Heffernan',
 						'lurkalot',
+						'Steve',

 						// Former Support Specialists
 						'Aleksi "Lex" Kilpinen',
@@ -676,7 +677,6 @@
 						'Old Fossil',
 						'S-Ace',
 						'shadav',
-						'Steve',
 						'Storman™',
 						'Wade "sησω" Poulsen',
 						'xenovanis',
diff -ur -x '*~' smf21git/Themes/default/languages/Timezones.english.php smf21mod/Themes/default/languages/Timezones.english.php
--- smf21git/Themes/default/languages/Timezones.english.php	2025-06-25 14:52:08.218673059 -0700
+++ smf21mod/Themes/default/languages/Timezones.english.php	2025-06-25 19:56:30.304397662 -0700
@@ -261,7 +261,6 @@
 $txt['America/Chihuahua'] = 'Chihuahua';
 $txt['America/Ciudad_Juarez'] = 'Ciudad Juárez';
 $txt['America/Costa_Rica'] = 'San José';
-$txt['America/Coyhaique'] = 'Coyhaique';
 $txt['America/Creston'] = 'Creston';
 $txt['America/Cuiaba'] = 'Cuiabá';
 $txt['America/Curacao'] = 'Curaçao';
diff -ur -x '*~' smf21git/Sources/Subs-Timezones.php smf21mod/Sources/Subs-Timezones.php
--- smf21git/Sources/Subs-Timezones.php	2025-06-25 14:52:08.193672580 -0700
+++ smf21mod/Sources/Subs-Timezones.php	2025-06-25 19:56:30.325398076 -0700
@@ -836,7 +836,6 @@
 		'CL' => array(
 			'America/Santiago',
 			'America/Punta_Arenas',
-			'America/Coyhaique',
 			'Pacific/Easter',
 		),
 		'CM' => array(
@@ -2067,33 +2066,6 @@
 				'tzid' => 'America/Denver',
 			),
 		),
-
-		// Diverged from America/Santiago in version 2025b.
-		// From 2025-03-20 onward, becomes the same as America/Punta_Arenas.
-		'America/Coyhaique' => array(
-			array(
-				'ts' => PHP_INT_MIN,
-				'tzid' => '',
-			),
-			array(
-				'ts' => strtotime('1890-01-01T04:48:16+0000'),
-				// Chile/Continental is an otherwise unused link to America/Santiago.
-				'tzid' => 'Chile/Continental',
-			),
-			array(
-				'ts' => strtotime('1942-08-01T05:00:00+0000'),
-				'tzid' => 'Etc/GMT+4',
-			),
-			array(
-				'ts' => strtotime('1946-08-29T04:00:00+0000'),
-				'tzid' => 'Chile/Continental',
-			),
-			array(
-				'ts' => strtotime('2025-03-20T03:00:00+0000'),
-				// America/Mendoza is an otherwise unused link to America/Argentina/Mendoza.
-				'tzid' => 'America/Mendoza',
-			),
-		),
 	);

 	$missing = array_diff($tzids, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC));```