diff --git a/Themes/default/css/index.css b/Themes/default/css/index.css
index 7075ba8e51..026d4fb2d4 100644
--- a/Themes/default/css/index.css
+++ b/Themes/default/css/index.css
@@ -2414,6 +2414,7 @@ dl {
-webkit-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
+ overflow-wrap: break-word;
}
.topic h4 {
margin: 3px 0;
@@ -3544,8 +3545,6 @@ ul.post_options li {
height: 22px;
}
#post_settings, #postAttachment, #postAttachment2, #attachment_previews {
- border-top: 1px solid #ddd;
- margin: -1px 0 0 0;
padding: 10px 0;
}
#postAttachment dd, #postAttachment2 dd {
@@ -4197,6 +4196,7 @@ tr[id^='list_news_lists_'] textarea {
.videocontainer video {
object-fit: contain;
background: black;
+ max-width: 100%;
}
.backtrace:not(:last-child) {
diff --git a/Themes/default/languages/Post.english.php b/Themes/default/languages/Post.english.php
index 44780c57d4..9876b20f08 100644
--- a/Themes/default/languages/Post.english.php
+++ b/Themes/default/languages/Post.english.php
@@ -78,10 +78,10 @@
$txt['reported_profile'] = 'Reported user';
$txt['report_following_user'] = 'The profile of "%1$s" at %2$s';
-$txt['attach_restrict_attachmentPostLimit'] = 'maximum total size %1$d KB';
-$txt['attach_restrict_attachmentPostLimit_MB'] = 'maximum total size %1$d MB';
-$txt['attach_restrict_attachmentSizeLimit'] = 'maximum individual size %1$d KB';
-$txt['attach_restrict_attachmentSizeLimit_MB'] = 'maximum individual size %1$d MB';
+$txt['attach_restrict_attachmentPostLimit'] = 'maximum total size %1$s KB';
+$txt['attach_restrict_attachmentPostLimit_MB'] = 'maximum total size %1$s MB';
+$txt['attach_restrict_attachmentSizeLimit'] = 'maximum individual size %1$s KB';
+$txt['attach_restrict_attachmentSizeLimit_MB'] = 'maximum individual size %1$s MB';
$txt['attach_restrict_attachmentNumPerPostLimit'] = '%1$d per post';
$txt['attach_restrictions'] = 'Restrictions:';
@@ -174,7 +174,7 @@
$txt['attach_folder_admin_warning'] = 'The path to the attachments directory (%1$s) is incorrect. Please correct it in the attachment settings area of your admin panel.';
$txt['attach_limit_nag'] = 'You have reached the maximum number of attachments allowed per post.';
$txt['attach_no_upload'] = 'There was a problem and your attachments could not be uploaded';
-$txt['attach_remaining'] = '%1$d attachments remaining';
+$txt['attach_remaining'] = '%1$d remaining';
$txt['attach_available'] = '%1$s KB available';
$txt['attach_kb'] = ' (%1$s KB)';
$txt['attach_0_byte_file'] = 'The file appears to be empty. Please contact your forum administrator if this continues to be a problem';
diff --git a/Themes/default/languages/Timezones.english.php b/Themes/default/languages/Timezones.english.php
index a495bb70d0..6aade1254e 100644
--- a/Themes/default/languages/Timezones.english.php
+++ b/Themes/default/languages/Timezones.english.php
@@ -573,6 +573,7 @@
$txt['Pacific/Guadalcanal'] = 'Guadalcanal';
$txt['Pacific/Guam'] = 'Guam';
$txt['Pacific/Honolulu'] = 'Honolulu';
+$txt['Pacific/Kanton'] = 'Canton Island';
$txt['Pacific/Kiritimati'] = 'Kiritimati';
$txt['Pacific/Kosrae'] = 'Tofol';
$txt['Pacific/Kwajalein'] = 'Kwajalein';
diff --git a/Themes/default/languages/index.english.php b/Themes/default/languages/index.english.php
index ed5b2d2a1d..4d0b7db389 100644
--- a/Themes/default/languages/index.english.php
+++ b/Themes/default/languages/index.english.php
@@ -887,7 +887,7 @@
// Inline attachments messages.
$txt['attachments_not_enable'] = 'Attachments are disabled';
$txt['attachments_no_data_loaded'] = 'Not a valid attachment ID.';
-$txt['attachments_not_allowed_to_see'] = 'You cannot see attachments on this board.';
+$txt['attachments_not_allowed_to_see'] = 'You cannot view this attachment.';
$txt['attachments_no_msg_associated'] = 'No message is associated with this attachment.';
$txt['attachments_unapproved'] = 'Attachment is awaiting approval.';
diff --git a/Themes/default/scripts/smf_fileUpload.js b/Themes/default/scripts/smf_fileUpload.js
index e3d4f80e42..9517e372d9 100644
--- a/Themes/default/scripts/smf_fileUpload.js
+++ b/Themes/default/scripts/smf_fileUpload.js
@@ -515,6 +515,9 @@ function smf_fileUpload(oOptions) {
$('#attachment_previews').show();
+ // Hide this, too. The progress bar does a better job.
+ $('.attach_available').remove();
+
// Show the drag-and-drop instructions and buttons
$('#drop_zone_ui').show();
diff --git a/cron.php b/cron.php
index 07963203df..48732c3a40 100644
--- a/cron.php
+++ b/cron.php
@@ -103,6 +103,10 @@
require_once($sourcedir . '/Security.php');
require_once($sourcedir . '/Subs.php');
+// Ensure we don't trip over disabled internal functions
+if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once($sourcedir . '/Subs-Compat.php');
+
// Create a variable to store some SMF specific functions in.
$smcFunc = array();
diff --git a/index.php b/index.php
index 18cb079c52..dfaffb1cf9 100644
--- a/index.php
+++ b/index.php
@@ -77,6 +77,10 @@
require_once($sourcedir . '/Load.php');
require_once($sourcedir . '/Security.php');
+// Ensure we don't trip over disabled internal functions
+if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once($sourcedir . '/Subs-Compat.php');
+
// If $maintenance is set specifically to 2, then we're upgrading or something.
if (!empty($maintenance) && 2 === $maintenance)
{
diff --git a/other/install.php b/other/install.php
index a3551947c5..c27275d35c 100644
--- a/other/install.php
+++ b/other/install.php
@@ -35,6 +35,9 @@
require_once('Sources/Class-Package.php');
+if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once('Sources/Subs-Compat.php');
+
// Database info.
$databases = array(
'mysql' => array(
@@ -1293,7 +1296,7 @@ function DatabasePopulation()
$current_statement = '';
// Wait, wait, I'm still working here!
- set_time_limit(60);
+ @set_time_limit(60);
}
// Sort out the context for the SQL.
diff --git a/other/install_2-1_mysql.sql b/other/install_2-1_mysql.sql
index cd9cf71420..0f2922591e 100644
--- a/other/install_2-1_mysql.sql
+++ b/other/install_2-1_mysql.sql
@@ -735,7 +735,7 @@ CREATE TABLE {$db_prefix}members (
warning TINYINT NOT NULL DEFAULT '0',
passwd_flood VARCHAR(12) NOT NULL DEFAULT '',
pm_receive_from TINYINT UNSIGNED NOT NULL DEFAULT '1',
- timezone VARCHAR(80) NOT NULL DEFAULT 'UTC',
+ timezone VARCHAR(80) NOT NULL DEFAULT '',
tfa_secret VARCHAR(24) NOT NULL DEFAULT '',
tfa_backup VARCHAR(64) NOT NULL DEFAULT '',
PRIMARY KEY (id_member),
diff --git a/other/install_2-1_postgresql.sql b/other/install_2-1_postgresql.sql
index 69eb77a4c1..8607520c21 100644
--- a/other/install_2-1_postgresql.sql
+++ b/other/install_2-1_postgresql.sql
@@ -1103,7 +1103,7 @@ CREATE TABLE {$db_prefix}members (
warning smallint NOT NULL DEFAULT '0',
passwd_flood varchar(12) NOT NULL DEFAULT '',
pm_receive_from smallint NOT NULL DEFAULT '1',
- timezone varchar(80) NOT NULL DEFAULT 'UTC',
+ timezone varchar(80) NOT NULL DEFAULT '',
tfa_secret varchar(24) NOT NULL DEFAULT '',
tfa_backup varchar(64) NOT NULL DEFAULT '',
PRIMARY KEY (id_member)
diff --git a/other/upgrade.php b/other/upgrade.php
index bfbc22a9a6..b873620b16 100644
--- a/other/upgrade.php
+++ b/other/upgrade.php
@@ -115,7 +115,6 @@
$upcontext['database_step'] = 3;
// Secure some resources
-@set_time_limit(600);
@ini_set('mysql.connect_timeout', -1);
@ini_set('default_socket_timeout', 900);
@ini_set('memory_limit', '512M');
@@ -689,6 +688,11 @@ function loadEssentialData()
require_once($sourcedir . '/Subs.php');
+ if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once($sourcedir . '/Subs-Compat.php');
+
+ @set_time_limit(600);
+
$smcFunc['random_int'] = function($min = 0, $max = PHP_INT_MAX)
{
global $sourcedir;
@@ -2634,7 +2638,6 @@ function cmdStep0()
while (ob_get_level() > 0)
ob_end_clean();
ob_implicit_flush(1);
- @set_time_limit(600);
if (!isset($_SERVER['argv']))
$_SERVER['argv'] = array();
diff --git a/other/upgrade_2-1_mysql.sql b/other/upgrade_2-1_mysql.sql
index 8b4e4365d7..de13ca212b 100644
--- a/other/upgrade_2-1_mysql.sql
+++ b/other/upgrade_2-1_mysql.sql
@@ -2383,7 +2383,7 @@ ADD COLUMN modified_reason VARCHAR(255) NOT NULL DEFAULT '';
--- Adding timezone support
/******************************************************************************/
---# Adding the "timezone" column to the members table
-ALTER TABLE {$db_prefix}members ADD timezone VARCHAR(80) NOT NULL DEFAULT 'UTC';
+ALTER TABLE {$db_prefix}members ADD timezone VARCHAR(80) NOT NULL DEFAULT '';
---#
---# Converting time offset to timezone
diff --git a/other/upgrade_2-1_postgresql.sql b/other/upgrade_2-1_postgresql.sql
index cd72a8b3f7..1856792576 100644
--- a/other/upgrade_2-1_postgresql.sql
+++ b/other/upgrade_2-1_postgresql.sql
@@ -811,7 +811,12 @@ ADD COLUMN IF NOT EXISTS status smallint NOT NULL default '0',
ADD COLUMN IF NOT EXISTS id_member_acted int NOT NULL default '0',
ADD COLUMN IF NOT EXISTS member_name_acted varchar(255) NOT NULL default '',
ADD COLUMN IF NOT EXISTS time_acted int NOT NULL default '0',
-ADD COLUMN IF NOT EXISTS act_reason text NOT NULL;
+ADD COLUMN IF NOT EXISTS act_reason text NOT NULL default '';
+---#
+
+---# Adding new columns to log_group_requests - drop defaults now that existing rows have been set
+ALTER TABLE {$db_prefix}log_group_requests
+ALTER COLUMN act_reason DROP DEFAULT;
---#
---# Adjusting the indexes for log_group_requests
@@ -824,7 +829,12 @@ CREATE INDEX {$db_prefix}log_group_requests_id_member ON {$db_prefix}log_group_r
/******************************************************************************/
---# Adding support for tag in package manager
ALTER TABLE {$db_prefix}log_packages
-ADD COLUMN IF NOT EXISTS credits TEXT NOT NULL;
+ADD COLUMN IF NOT EXISTS credits TEXT NOT NULL default '';
+---#
+
+---# Adding support for - drop default now that existing rows have been set
+ALTER TABLE {$db_prefix}log_packages
+ALTER COLUMN credits DROP DEFAULT;
---#
---# Adding support for package hashes
@@ -2616,7 +2626,7 @@ ADD COLUMN IF NOT EXISTS modified_reason varchar(255) NOT NULL default '';
--- Adding timezone support
/******************************************************************************/
---# Adding the "timezone" column to the members table
-ALTER TABLE {$db_prefix}members ADD IF NOT EXISTS timezone VARCHAR(80) NOT NULL DEFAULT 'UTC';
+ALTER TABLE {$db_prefix}members ADD IF NOT EXISTS timezone VARCHAR(80) NOT NULL DEFAULT '';
---#
---# Converting time offset to timezone
diff --git a/proxy.php b/proxy.php
index 51785f6b6d..f650deb31f 100644
--- a/proxy.php
+++ b/proxy.php
@@ -81,6 +81,10 @@ public function __construct()
require_once(dirname(__FILE__) . '/Settings.php');
require_once($sourcedir . '/Subs.php');
+ // Ensure we don't trip over disabled internal functions
+ if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once($sourcedir . '/Subs-Compat.php');
+
// Make absolutely sure the cache directory is defined and writable.
if (empty($cachedir) || !is_dir($cachedir) || !is_writable($cachedir))
{
diff --git a/subscriptions.php b/subscriptions.php
index db20796cc6..0a022bc1cb 100644
--- a/subscriptions.php
+++ b/subscriptions.php
@@ -28,6 +28,10 @@
// For any admin emailing.
require_once($sourcedir . '/Subs-Admin.php');
+// Ensure we don't trip over disabled internal functions
+if (version_compare(PHP_VERSION, '8.0.0', '>='))
+ require_once($sourcedir . '/Subs-Compat.php');
+
loadLanguage('ManagePaid');
// If there's literally nothing coming in, let's take flight!