Merge branch 'release-2.1' into calendarFix

jdarwood007 · jdarwood007 · commit 36603567fd1c · 2026-01-17T04:17:45.000-08:00
diff --git a/SSI.php b/SSI.php
@@ -5,7 +5,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
@@ -18,7 +18,7 @@
 define('SMF', 'SSI');
 define('SMF_VERSION', '2.1.7');
 define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
-define('SMF_SOFTWARE_YEAR', '2025');
+define('SMF_SOFTWARE_YEAR', '2026');
 define('JQUERY_VERSION', '3.6.3');
 define('POSTGRE_TITLE', 'PostgreSQL');
 define('MYSQL_TITLE', 'MySQL');
diff --git a/cron.php b/cron.php
@@ -14,7 +14,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
@@ -23,7 +23,7 @@
 define('SMF', 'BACKGROUND');
 define('SMF_VERSION', '2.1.7');
 define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
-define('SMF_SOFTWARE_YEAR', '2025');
+define('SMF_SOFTWARE_YEAR', '2026');
 define('FROM_CLI', empty($_SERVER['REQUEST_METHOD']));
 
 define('JQUERY_VERSION', '3.6.3');
diff --git a/index.php b/index.php
@@ -14,7 +14,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
@@ -24,7 +24,7 @@
 define('SMF', 1);
 define('SMF_VERSION', '2.1.7');
 define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
-define('SMF_SOFTWARE_YEAR', '2025');
+define('SMF_SOFTWARE_YEAR', '2026');
 
 define('JQUERY_VERSION', '3.6.3');
 define('POSTGRE_TITLE', 'PostgreSQL');
diff --git a/other/Settings.php b/other/Settings.php
@@ -7,7 +7,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
diff --git a/other/Settings_bak.php b/other/Settings_bak.php
@@ -7,7 +7,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
diff --git a/other/install.php b/other/install.php
@@ -5,15 +5,15 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
  */
 
 define('SMF_VERSION', '2.1.7');
 define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
-define('SMF_SOFTWARE_YEAR', '2025');
+define('SMF_SOFTWARE_YEAR', '2026');
 define('DB_SCRIPT_VERSION', '2-1');
 define('SMF_INSTALLING', 1);
 
diff --git a/other/upgrade-helper.php b/other/upgrade-helper.php
@@ -5,7 +5,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
diff --git a/other/upgrade.php b/other/upgrade.php
@@ -5,7 +5,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
@@ -14,7 +14,7 @@
 // Version information...
 define('SMF_VERSION', '2.1.7');
 define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
-define('SMF_SOFTWARE_YEAR', '2025');
+define('SMF_SOFTWARE_YEAR', '2026');
 define('SMF_LANG_VERSION', '2.1.5');
 define('SMF_INSTALLING', 1);
 
diff --git a/proxy.php b/proxy.php
@@ -7,7 +7,7 @@
  *
  * @package SMF
  * @author Simple Machines https://www.simplemachines.org
- * @copyright 2025 Simple Machines and individual contributors
+ * @copyright 2026 Simple Machines and individual contributors
  * @license https://www.simplemachines.org/about/smf/license.php BSD
  *
  * @version 2.1.7
@@ -23,7 +23,7 @@
 	define('SMF_FULL_VERSION', 'SMF ' . SMF_VERSION);
 
 if (!defined('SMF_SOFTWARE_YEAR'))
-	define('SMF_SOFTWARE_YEAR', '2025');
+	define('SMF_SOFTWARE_YEAR', '2026');
 
 if (!defined('JQUERY_VERSION'))
 	define('JQUERY_VERSION', '3.6.3');

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* @package SMF`
`9`	`9`	`* @author Simple Machines https://www.simplemachines.org`
`10`		`- * @copyright 2025 Simple Machines and individual contributors`
	`10`	`+ * @copyright 2026 Simple Machines and individual contributors`
`11`	`11`	`* @license https://www.simplemachines.org/about/smf/license.php BSD`
`12`	`12`	`*`
`13`	`13`	`* @version 2.1.7`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*`
`6`	`6`	`* @package SMF`
`7`	`7`	`* @author Simple Machines https://www.simplemachines.org`
`8`		`- * @copyright 2025 Simple Machines and individual contributors`
	`8`	`+ * @copyright 2026 Simple Machines and individual contributors`
`9`	`9`	`* @license https://www.simplemachines.org/about/smf/license.php BSD`
`10`	`10`	`*`
`11`	`11`	`* @version 2.1.7`