[prep-release-3.3.9] Update changelog for 3.3.9

[prep-release-3.3.9] Add migration for 3.3.9
[prep-release-3.3.9] Update version numbers to 3.3.9
2025-09-17 11:32:07 +02:00 · 2022-11-23 20:54:42 +01:00 · 2022-11-23 20:53:56 +01:00 · 2022-11-23 20:53:53 +01:00 · 2022-11-22 21:21:24 +01:00 · 2022-11-14 20:07:27 +01:00
30 changed files with 413 additions and 114 deletions
--- a/build/build.xml
+++ b/build/build.xml
@@ -2,9 +2,9 @@

 <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
 	<!-- a few settings for the build -->
-	<property name="newversion" value="3.3.8-RC1" />
-	<property name="prevversion" value="3.3.7" />
-	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6" />
+	<property name="newversion" value="3.3.9" />
+	<property name="prevversion" value="3.3.8" />
+	<property name="olderversions" value="3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7, 3.1.7-pl1, 3.1.8, 3.1.9, 3.1.10, 3.1.11, 3.1.12, 3.2.0, 3.2.1, 3.2.2, 3.2.3, 3.2.4, 3.2.5, 3.2.6, 3.2.7, 3.2.8, 3.2.9, 3.2.10, 3.2.11, 3.3.0, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.3.5, 3.3.6, 3.3.7, 3.3.9-RC1" />
 	<!-- no configuration should be needed beyond this point -->

 	<property name="oldversions" value="${olderversions}, ${prevversion}" />
@@ -362,6 +362,8 @@
 		<chmod mode="0777" file="${dir}/store" />
 		<chmod mode="0777" file="${dir}/files" />
 		<chmod mode="0777" file="${dir}/images/avatars/upload" />
+		<!-- set permissions of executable scripts to 755 -->
+		<chmod mode="0755" file="${dir}/bin/phpbbcli.php" />
 	</target>

 	<target name="clean-vendor-dir">
--- a/phpBB/composer.json
+++ b/phpBB/composer.json
@@ -26,7 +26,7 @@
 		"phpbb/phpbb-core": "self.version"
 	},
 	"require": {
-		"php": "^7.1.3",
+		"php": "^7.1.3 || ^8.0.0",
 		"ext-json": "*",
 		"ext-mbstring": "*",
 		"bantu/ini-get-wrapper": "~1.0",
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "1b58e9d5054a0881d4c29cb2e9523908",
+    "content-hash": "0201f3008dec8046725fd5e9afd61ba7",
    "packages": [
        {
            "name": "bantu/ini-get-wrapper",
@@ -167,24 +167,24 @@
        },
        {
            "name": "guzzlehttp/guzzle",
-            "version": "6.5.6",
+            "version": "6.5.8",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "f092dd734083473658de3ee4bef093ed77d2689c"
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/f092dd734083473658de3ee4bef093ed77d2689c",
-                "reference": "f092dd734083473658de3ee4bef093ed77d2689c",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a52f0440530b54fa079ce76e8c5d196a42cad981",
+                "reference": "a52f0440530b54fa079ce76e8c5d196a42cad981",
                "shasum": ""
            },
            "require": {
                "ext-json": "*",
                "guzzlehttp/promises": "^1.0",
-                "guzzlehttp/psr7": "^1.6.1",
+                "guzzlehttp/psr7": "^1.9",
                "php": ">=5.5",
-                "symfony/polyfill-intl-idn": "^1.17.0"
+                "symfony/polyfill-intl-idn": "^1.17"
            },
            "require-dev": {
                "ext-curl": "*",
@@ -262,7 +262,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/6.5.6"
+                "source": "https://github.com/guzzle/guzzle/tree/6.5.8"
            },
            "funding": [
                {
@@ -278,20 +278,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-25T13:19:12+00:00"
+            "time": "2022-06-20T22:16:07+00:00"
        },
        {
            "name": "guzzlehttp/promises",
-            "version": "1.5.1",
+            "version": "1.5.2",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/promises.git",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da"
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
-                "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598",
+                "reference": "b94b2807d85443f9719887892882d0329d1e2598",
                "shasum": ""
            },
            "require": {
@@ -346,7 +346,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/promises/issues",
-                "source": "https://github.com/guzzle/promises/tree/1.5.1"
+                "source": "https://github.com/guzzle/promises/tree/1.5.2"
            },
            "funding": [
                {
@@ -362,20 +362,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2021-10-22T20:56:57+00:00"
+            "time": "2022-08-28T14:55:35+00:00"
        },
        {
            "name": "guzzlehttp/psr7",
-            "version": "1.8.5",
+            "version": "1.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268"
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268",
-                "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
+                "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318",
                "shasum": ""
            },
            "require": {
@@ -396,7 +396,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.7-dev"
+                    "dev-master": "1.9-dev"
                }
            },
            "autoload": {
@@ -456,7 +456,7 @@
            ],
            "support": {
                "issues": "https://github.com/guzzle/psr7/issues",
-                "source": "https://github.com/guzzle/psr7/tree/1.8.5"
+                "source": "https://github.com/guzzle/psr7/tree/1.9.0"
            },
            "funding": [
                {
@@ -472,7 +472,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-03-20T21:51:18+00:00"
+            "time": "2022-06-20T21:43:03+00:00"
        },
        {
            "name": "lusitanian/oauth",
@@ -922,16 +922,16 @@
        },
        {
            "name": "s9e/sweetdom",
-            "version": "2.0.0",
+            "version": "2.1.0",
            "source": {
                "type": "git",
                "url": "https://github.com/s9e/SweetDOM.git",
-                "reference": "5fc62bc1f4756650924e5cd1b429afcf34542722"
+                "reference": "9e34ff8f353234daed102274012c840bda56aff2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/5fc62bc1f4756650924e5cd1b429afcf34542722",
-                "reference": "5fc62bc1f4756650924e5cd1b429afcf34542722",
+                "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/9e34ff8f353234daed102274012c840bda56aff2",
+                "reference": "9e34ff8f353234daed102274012c840bda56aff2",
                "shasum": ""
            },
            "require": {
@@ -960,22 +960,22 @@
            ],
            "support": {
                "issues": "https://github.com/s9e/SweetDOM/issues",
-                "source": "https://github.com/s9e/SweetDOM/tree/2.0.0"
+                "source": "https://github.com/s9e/SweetDOM/tree/2.1.0"
            },
-            "time": "2020-12-08T16:34:58+00:00"
+            "time": "2021-05-24T21:06:33+00:00"
        },
        {
            "name": "s9e/text-formatter",
-            "version": "2.11.2",
+            "version": "2.11.5",
            "source": {
                "type": "git",
                "url": "https://github.com/s9e/TextFormatter.git",
-                "reference": "34f49739a6cabd93579b94fe5380919af5404d18"
+                "reference": "186b633ee825a93e0060368bfdf8bd46311e3163"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34f49739a6cabd93579b94fe5380919af5404d18",
-                "reference": "34f49739a6cabd93579b94fe5380919af5404d18",
+                "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/186b633ee825a93e0060368bfdf8bd46311e3163",
+                "reference": "186b633ee825a93e0060368bfdf8bd46311e3163",
                "shasum": ""
            },
            "require": {
@@ -1002,7 +1002,7 @@
            },
            "type": "library",
            "extra": {
-                "version": "2.11.2"
+                "version": "2.11.5"
            },
            "autoload": {
                "psr-4": {
@@ -1034,9 +1034,9 @@
            ],
            "support": {
                "issues": "https://github.com/s9e/TextFormatter/issues",
-                "source": "https://github.com/s9e/TextFormatter/tree/2.11.2"
+                "source": "https://github.com/s9e/TextFormatter/tree/2.11.5"
            },
-            "time": "2022-06-05T19:21:32+00:00"
+            "time": "2022-09-19T00:20:37+00:00"
        },
        {
            "name": "symfony/config",
@@ -1264,6 +1264,7 @@
                    "type": "tidelift"
                }
            ],
+            "abandoned": "symfony/error-handler",
            "time": "2020-10-24T10:57:07+00:00"
        },
        {
@@ -2656,16 +2657,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v2.15.1",
+            "version": "v2.15.3",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4"
+                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
-                "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a",
+                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a",
                "shasum": ""
            },
            "require": {
@@ -2720,7 +2721,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.15.1"
+                "source": "https://github.com/twigphp/Twig/tree/v2.15.3"
            },
            "funding": [
                {
@@ -2732,7 +2733,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-05-17T05:46:24+00:00"
+            "time": "2022-09-28T08:40:08+00:00"
        },
        {
            "name": "zendframework/zend-code",
@@ -3216,16 +3217,16 @@
        },
        {
            "name": "phing/phing",
-            "version": "2.17.3",
+            "version": "2.17.4",
            "source": {
                "type": "git",
                "url": "https://github.com/phingofficial/phing.git",
-                "reference": "053cb496cf49608d19f85664d85d71c48b241667"
+                "reference": "9f3bc8c72e65452686dcf64497e02a082f138908"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/053cb496cf49608d19f85664d85d71c48b241667",
-                "reference": "053cb496cf49608d19f85664d85d71c48b241667",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/9f3bc8c72e65452686dcf64497e02a082f138908",
+                "reference": "9f3bc8c72e65452686dcf64497e02a082f138908",
                "shasum": ""
            },
            "require": {
@@ -3308,7 +3309,7 @@
            "support": {
                "irc": "irc://irc.freenode.net/phing",
                "issues": "https://www.phing.info/trac/report",
-                "source": "https://github.com/phingofficial/phing/tree/2.17.3"
+                "source": "https://github.com/phingofficial/phing/tree/2.17.4"
            },
            "funding": [
                {
@@ -3324,20 +3325,20 @@
                    "type": "patreon"
                }
            ],
-            "time": "2022-05-04T19:17:50+00:00"
+            "time": "2022-07-08T09:07:07+00:00"
        },
        {
            "name": "php-webdriver/webdriver",
-            "version": "1.12.1",
+            "version": "1.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/php-webdriver/php-webdriver.git",
-                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a"
+                "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
-                "reference": "b27ddf458d273c7d4602106fcaf978aa0b7fe15a",
+                "url": "https://api.github.com/repos/php-webdriver/php-webdriver/zipball/6dfe5f814b796c1b5748850aa19f781b9274c36c",
+                "reference": "6dfe5f814b796c1b5748850aa19f781b9274c36c",
                "shasum": ""
            },
            "require": {
@@ -3387,9 +3388,9 @@
            ],
            "support": {
                "issues": "https://github.com/php-webdriver/php-webdriver/issues",
-                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.12.1"
+                "source": "https://github.com/php-webdriver/php-webdriver/tree/1.13.1"
            },
-            "time": "2022-05-03T12:16:34+00:00"
+            "time": "2022-10-11T11:49:44+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
@@ -4111,16 +4112,16 @@
        },
        {
            "name": "sebastian/comparator",
-            "version": "3.0.3",
+            "version": "3.0.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758"
+                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758",
-                "reference": "1071dfcef776a57013124ff35e1fc41ccd294758",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
+                "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770",
                "shasum": ""
            },
            "require": {
@@ -4173,7 +4174,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5"
            },
            "funding": [
                {
@@ -4181,7 +4182,7 @@
                    "type": "github"
                }
            ],
-            "time": "2020-11-30T08:04:30+00:00"
+            "time": "2022-09-14T12:31:48+00:00"
        },
        {
            "name": "sebastian/diff",
@@ -4314,16 +4315,16 @@
        },
        {
            "name": "sebastian/exporter",
-            "version": "3.1.4",
+            "version": "3.1.5",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db"
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
-                "reference": "0c32ea2e40dbf59de29f3b49bf375176ce7dd8db",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6",
+                "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6",
                "shasum": ""
            },
            "require": {
@@ -4379,7 +4380,7 @@
            ],
            "support": {
                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.4"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5"
            },
            "funding": [
                {
@@ -4387,7 +4388,7 @@
                    "type": "github"
                }
            ],
-            "time": "2021-11-11T13:51:24+00:00"
+            "time": "2022-09-14T06:00:17+00:00"
        },
        {
            "name": "sebastian/global-state",
@@ -4720,16 +4721,16 @@
        },
        {
            "name": "squizlabs/php_codesniffer",
-            "version": "3.6.2",
+            "version": "3.7.1",
            "source": {
                "type": "git",
                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a"
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5e4e71592f69da17871dba6e80dd51bce74a351a",
-                "reference": "5e4e71592f69da17871dba6e80dd51bce74a351a",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
                "shasum": ""
            },
            "require": {
@@ -4772,7 +4773,7 @@
                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
            },
-            "time": "2021-12-12T21:44:58+00:00"
+            "time": "2022-06-18T07:21:10+00:00"
        },
        {
            "name": "symfony/browser-kit",
@@ -5081,7 +5082,7 @@
    "prefer-stable": false,
    "prefer-lowest": false,
    "platform": {
-        "php": "^7.1.3",
+        "php": "^7.1.3 || ^8.0.0",
        "ext-json": "*",
        "ext-mbstring": "*"
    },
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -50,6 +50,8 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ul>
+		<li><a href="#v339rc1">Changes since 3.3.9-RC1</a></li>
+		<li><a href="#v338">Changes since 3.3.8</a></li>
 		<li><a href="#v337">Changes since 3.3.7</a></li>
 		<li><a href="#v336">Changes since 3.3.6</a></li>
 		<li><a href="#v336rc1">Changes since 3.3.6-RC1</a></li>
@@ -162,6 +164,42 @@
 		<div class="inner">

 		<div class="content">
+			<a name="v339rc1"></a><h3>Changes since 3.3.9-RC1</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17058">PHPBB3-17058</a>] - Special character issue in emails from PHP 8.0 and higher</li>
+			</ul>
+			<h4>Hardening</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/SECURITY-274">SECURITY-274</a>] - Reset login keys/session when resetting password</li>
+			</ul>
+
+			<a name="v338"></a><h3>Changes since 3.3.8</h3>
+			<h4>Bug</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16917">PHPBB3-16917</a>] - bin/phpbb.cli requires 755 permissions</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16932">PHPBB3-16932</a>] - Invalid email To: header on notifications to users with @ in name</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17003">PHPBB3-17003</a>] - Icon of a topic do not show up in the UCP &gt; Front Page.</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17019">PHPBB3-17019</a>] - Missing &quot;youtube&quot; profilefield stops Database update</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17023">PHPBB3-17023</a>] - phpBB 3.3: PHP8 supported but not indicated by composer.json</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17026">PHPBB3-17026</a>] - Session viewonline not defined in Memberlist</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17030">PHPBB3-17030</a>] - Feed doesn't generate valid RFC-3339 dates</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17032">PHPBB3-17032</a>] - Missing or invalid user entry for anonymous user may result in stack overflow</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17036">PHPBB3-17036</a>] - Update guzzle to latest version</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17050">PHPBB3-17050</a>] - Unnecessary trailing slash in void HTML elements</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17051">PHPBB3-17051</a>] - Textformatter may generate PHP warnings if user is not fully initialized in PHP 8.1</li>
+			</ul>
+			<h4>Improvement</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-16916">PHPBB3-16916</a>] - Enhance the PHP version error message on startup and install</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17005">PHPBB3-17005</a>] - List item closing tag missing slash in posting_topic_review</li>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17006">PHPBB3-17006</a>] - &quot;www.&quot; not needed and may lead to confusion</li>
+			</ul>
+			<h4>Task</h4>
+			<ul>
+				<li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-17048">PHPBB3-17048</a>] - Update composer and dependencies for 3.3.9</li>
+			</ul>
+
 			<a name="v337"></a><h3>Changes since 3.3.7</h3>
 			<h4>Bug</h4>
 			<ul>
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
 */

 // phpBB Version
-@define('PHPBB_VERSION', '3.3.8-RC1');
+@define('PHPBB_VERSION', '3.3.9');

 // QA-related
 // define('PHPBB_QA', 1);
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -597,7 +597,7 @@ class messenger
 			$this->from = $board_contact;
 		}

-		$encode_eol = ($config['smtp_delivery']) ? "\r\n" : PHP_EOL;
+		$encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;

 		// Build to, cc and bcc strings
 		$to = $cc = $bcc = '';
@@ -629,7 +629,7 @@ class messenger
 			}
 			else
 			{
-				$result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, PHP_EOL, $err_msg);
+				$result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $encode_eol, $err_msg);
 			}

 			if (!$result)
@@ -952,7 +952,8 @@ class queue
 							}
 							else
 							{
-								$result = phpbb_mail($to, $subject, $msg, $headers, PHP_EOL, $err_msg);
+								$encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL;
+								$result = phpbb_mail($to, $subject, $msg, $headers, $encode_eol, $err_msg);
 							}

 							if (!$result)
@@ -1882,7 +1883,7 @@ function mail_encode($str, $eol = "\r\n")
 	{
 		$encoded_char = $is_quoted_printable
 			? $char = preg_replace_callback(
-				'/[=_\?\x20\x00-\x1F\x80-\xFF]/',
+				'/[()<>@,;:\\\\".\[\]=_?\x20\x00-\x1F\x80-\xFF]/',
 				function ($matches)
 				{
 					$hex = dechex(ord($matches[0]));
--- a/phpBB/includes/startup.php
+++ b/phpBB/includes/startup.php
@@ -27,7 +27,7 @@ error_reporting($level);
 */
 if (version_compare(PHP_VERSION, '7.1.3', '<'))
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
+	die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
 }
 // Register globals and magic quotes have been dropped in PHP 5.4 so no need for extra checks

--- a/phpBB/includes/ucp/ucp_main.php
+++ b/phpBB/includes/ucp/ucp_main.php
@@ -35,7 +35,7 @@ class ucp_main

 	function main($id, $mode)
 	{
-		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+		global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx, $phpbb_dispatcher, $cache;
 		global $request;

 		switch ($mode)
@@ -44,8 +44,8 @@ class ucp_main

 				$user->add_lang('memberlist');

-				$sql_from = TOPICS_TABLE . ' t ';
-				$sql_select = '';
+				$sql_from = TOPICS_TABLE . ' t LEFT JOIN ' . FORUMS_TABLE . ' f ON (f.forum_id = t.forum_id) ';
+				$sql_select = ', f.enable_icons';

 				if ($config['load_db_track'])
 				{
@@ -137,6 +137,9 @@ class ucp_main
 				}
 				unset($topic_forum_list);

+				// Grab icons
+				$icons = $cache->obtain_icons();
+
 				foreach ($topic_list as $topic_id)
 				{
 					$row = &$rowset[$topic_id];
@@ -176,10 +179,14 @@ class ucp_main
 						'TOPIC_TITLE'				=> censor_text($row['topic_title']),
 						'TOPIC_TYPE'				=> $topic_type,

+						'TOPIC_ICON_IMG'		=> !empty($icons[$row['icon_id']]) ? $icons[$row['icon_id']]['img'] : '',
+						'TOPIC_ICON_IMG_WIDTH'	=> !empty($icons[$row['icon_id']]) ? $icons[$row['icon_id']]['width'] : '',
+						'TOPIC_ICON_IMG_HEIGHT'	=> !empty($icons[$row['icon_id']]) ? $icons[$row['icon_id']]['height'] : '',
 						'TOPIC_IMG_STYLE'		=> $folder_img,
 						'TOPIC_FOLDER_IMG'		=> $user->img($folder_img, $folder_alt),
 						'ATTACH_ICON_IMG'		=> ($auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id) && $row['topic_attachment']) ? $user->img('icon_topic_attach', '') : '',

+						'S_TOPIC_ICONS'		=> $row['enable_icons'] ? true : false,
 						'S_USER_POSTED'		=> (!empty($row['topic_posted']) && $row['topic_posted']) ? true : false,
 						'S_UNREAD'			=> $unread_topic,

--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -22,7 +22,7 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);

 if (version_compare(PHP_VERSION, '7.1.3', '<'))
 {
-	die('You are running an unsupported PHP version. Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
+	die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 7.1.3 or higher before trying to install or update to phpBB 3.3');
 }

 $startup_new_path = $phpbb_root_path . 'install/update/update/new/install/startup.' . $phpEx;
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms);
 $convertor_data = array(
 	'forum_name'	=> 'phpBB 2.0.x',
 	'version'		=> '1.0.3',
-	'phpbb_version'	=> '3.3.8',
+	'phpbb_version'	=> '3.3.9',
 	'author'		=> '<a href="https://www.phpbb.com/">phpBB Limited</a>',
 	'dbms'			=> $dbms,
 	'dbhost'		=> $dbhost,
--- a/phpBB/install/phpbbcli.php
+++ b/phpBB/install/phpbbcli.php
@@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli')
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
 define('PHPBB_ENVIRONMENT', 'production');
-define('PHPBB_VERSION', '3.3.8-RC1');
+define('PHPBB_VERSION', '3.3.9');
 $phpbb_root_path = __DIR__ . '/../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);

--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.8-RC1');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.9');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');

--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -483,7 +483,7 @@ $lang = array_merge($lang, array(
 	'SCRIPT_PATH'				=> 'Script path',
 	'SCRIPT_PATH_EXPLAIN'		=> 'The path where phpBB is located relative to the domain name, e.g. <samp>/phpBB3</samp>.',
 	'SERVER_NAME'				=> 'Domain name',
-	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>www.example.com</samp>).',
+	'SERVER_NAME_EXPLAIN'		=> 'The domain name this board runs from (for example: <samp>example.com</samp>).',
 	'SERVER_PORT'				=> 'Server port',
 	'SERVER_PORT_EXPLAIN'		=> 'The port your server is running on, usually 80, only change if different.',
 	'SERVER_PROTOCOL'			=> 'Server protocol',
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -1634,17 +1634,20 @@ switch ($mode)
 		if (count($user_list))
 		{
 			// Session time?! Session time...
-			$sql = 'SELECT session_user_id, MAX(session_time) AS session_time
+			$sql = 'SELECT session_user_id, MAX(session_time) AS session_time, MIN(session_viewonline) AS session_viewonline
 				FROM ' . SESSIONS_TABLE . '
 				WHERE session_time >= ' . (time() - $config['session_length']) . '
 					AND ' . $db->sql_in_set('session_user_id', $user_list) . '
 				GROUP BY session_user_id';
 			$result = $db->sql_query($sql);

-			$session_times = array();
+			$session_ary = [];
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$session_times[$row['session_user_id']] = $row['session_time'];
+				$session_ary[$row['session_user_id']] = [
+					'session_time' => $row['session_time'],
+					'session_viewonline' => $row['session_viewonline'],
+				];
 			}
 			$db->sql_freeresult($result);

@@ -1708,7 +1711,8 @@ switch ($mode)
 			$id_cache = array();
 			while ($row = $db->sql_fetchrow($result))
 			{
-				$row['session_time'] = (!empty($session_times[$row['user_id']])) ? $session_times[$row['user_id']] : 0;
+				$row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0;
+				$row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0;
 				$row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_lastvisit'];

 				$id_cache[$row['user_id']] = $row;
--- a/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php
+++ b/phpBB/phpbb/db/migration/data/v33x/profilefield_youtube_update.php
@@ -30,7 +30,7 @@ class profilefield_youtube_update extends \phpbb\db\migration\migration
 		$row = $this->db->sql_fetchrow($result);
 		$this->db->sql_freeresult($result);

-		return $row['field_validation'] === $this->youtube_url_matcher;
+		return !$row || $row['field_validation'] === $this->youtube_url_matcher;
 	}

 	public static function depends_on()
--- a/phpBB/phpbb/db/migration/data/v33x/v338.php
+++ b/phpBB/phpbb/db/migration/data/v33x/v338.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v338 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.8', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v338rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.8']],
+		];
+	}
+}
--- a/phpBB/phpbb/db/migration/data/v33x/v339.php
+++ b/phpBB/phpbb/db/migration/data/v33x/v339.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v339 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.9', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v339rc1',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.9']],
+		];
+	}
+}
--- a/phpBB/phpbb/db/migration/data/v33x/v339rc1.php
+++ b/phpBB/phpbb/db/migration/data/v33x/v339rc1.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ *
+ * This file is part of the phpBB Forum Software package.
+ *
+ * @copyright (c) phpBB Limited <https://www.phpbb.com>
+ * @license GNU General Public License, version 2 (GPL-2.0)
+ *
+ * For full copyright and license information, please see
+ * the docs/CREDITS.txt file.
+ *
+ */
+
+namespace phpbb\db\migration\data\v33x;
+
+class v339rc1 extends \phpbb\db\migration\migration
+{
+	public function effectively_installed()
+	{
+		return version_compare($this->config['version'], '3.3.9-RC1', '>=');
+	}
+
+	public static function depends_on()
+	{
+		return [
+			'\phpbb\db\migration\data\v33x\v338',
+		];
+	}
+
+	public function update_data()
+	{
+		return [
+			['config.update', ['version', '3.3.9-RC1']],
+		];
+	}
+}
--- a/phpBB/phpbb/feed/helper.php
+++ b/phpBB/phpbb/feed/helper.php
@@ -97,7 +97,7 @@ class helper
 		if (empty($offset_string))
 		{
 			$zone_offset = $this->user->create_datetime()->getOffset();
-			$offset_string = phpbb_format_timezone_offset($zone_offset);
+			$offset_string = phpbb_format_timezone_offset($zone_offset, true);
 		}

 		return gmdate("Y-m-d\TH:i:s", $time + $zone_offset) . $offset_string;
--- a/phpBB/phpbb/template/assets_bag.php
+++ b/phpBB/phpbb/template/assets_bag.php
@@ -62,27 +62,27 @@ class assets_bag
 	}

 	/**
-	 * Returns the HTML code to includes all css assets
+	 * Returns the HTML code to include all css assets
 	 *
 	 * @return string
 	 */
-	public function get_stylesheets_content()
+	public function get_stylesheets_content(): string
 	{
 		$output = '';
 		foreach ($this->stylesheets as $stylesheet)
 		{
-			$output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" media=\"screen\" />\n";
+			$output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" media=\"screen\">\n";
 		}

 		return $output;
 	}

 	/**
-	 * Returns the HTML code to includes all js assets
+	 * Returns the HTML code to include all js assets
 	 *
 	 * @return string
 	 */
-	public function get_scripts_content()
+	public function get_scripts_content(): string
 	{
 		$output = '';
 		foreach ($this->scripts as $script)
--- a/phpBB/phpbb/textformatter/s9e/renderer.php
+++ b/phpBB/phpbb/textformatter/s9e/renderer.php
@@ -152,7 +152,7 @@ class renderer implements \phpbb\textformatter\renderer_interface
 	* @param  \phpbb\user          $user
 	* @param  \phpbb\config\config $config
 	* @param  \phpbb\auth\auth     $auth
-	* @return null
+	* @return void
 	*/
 	public function configure_user(\phpbb\user $user, \phpbb\config\config $config, \phpbb\auth\auth $auth)
 	{
@@ -175,10 +175,10 @@ class renderer implements \phpbb\textformatter\renderer_interface

 		// Set this user's style id and other parameters
 		$this->renderer->setParameters(array(
-			'S_IS_BOT'          => $user->data['is_bot'],
-			'S_REGISTERED_USER' => $user->data['is_registered'],
-			'S_USER_LOGGED_IN'  => ($user->data['user_id'] != ANONYMOUS),
-			'STYLE_ID'          => $user->style['style_id'],
+			'S_IS_BOT'			=> $user->data['is_bot'] ?? false,
+			'S_REGISTERED_USER'	=> $user->data['is_registered'] ?? false,
+			'S_USER_LOGGED_IN'	=> ($user->data['user_id'] != ANONYMOUS),
+			'STYLE_ID'			=> $user->style['style_id'],
 		));
 	}

--- a/phpBB/phpbb/ucp/controller/reset_password.php
+++ b/phpBB/phpbb/ucp/controller/reset_password.php
@@ -415,6 +415,7 @@ class reset_password
 							SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . '
 							WHERE user_id = ' . (int) $user_row['user_id'];
 				$this->db->sql_query($sql);
+				$this->user->reset_login_keys();
 				$this->log->add('user', $user_row['user_id'], $this->user->ip, 'LOG_USER_NEW_PASSWORD', false, [
 					'reportee_id' => $user_row['user_id'],
 					$user_row['username']
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -141,7 +141,7 @@ class user_loader
 		{
 			$this->load_users(array($user_id));

-			return $this->get_user($user_id);
+			return $user_id != ANONYMOUS ? $this->get_user($user_id) : $this->users[$user_id] ?? false;
 		}

 		return $this->get_user(ANONYMOUS);
--- a/phpBB/styles/prosilver/style.cfg
+++ b/phpBB/styles/prosilver/style.cfg
@@ -21,8 +21,8 @@
 # General Information about this style
 name = prosilver
 copyright = © phpBB Limited, 2007
-style_version = 3.3.8
-phpbb_version = 3.3.8
+style_version = 3.3.9
+phpbb_version = 3.3.9

 # Defining a different template bitfield
 # template_bitfield = //g=
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -35,7 +35,7 @@
 					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
 						<i class="icon fa-info fa-fw" aria-hidden="true"></i><span class="sr-only">{L_POST_DETAILS}</span>
 					</a>
-				<li>
+				</li>
 			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
 				<li>
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -14,7 +14,7 @@
 	<!-- BEGIN topicrow -->
 		<li class="row<!-- IF topicrow.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF -->">
 			<dl class="row-item {topicrow.TOPIC_IMG_STYLE}">
-				<dt <!-- IF topicrow.TOPIC_ICON_IMG -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
+				<dt <!-- IF topicrow.TOPIC_ICON_IMG and topicrow.S_TOPIC_ICONS -->style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"<!-- ENDIF -->>
 					<!-- IF topicrow.S_UNREAD_TOPIC --><a href="{topicrow.U_NEWEST_POST}" class="row-item-link"></a><!-- ENDIF -->
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD -->
--- a/tests/template/template_includecss_test.php
+++ b/tests/template/template_includecss_test.php
@@ -95,19 +95,19 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
 			*/
 			array(
 				array('TEST' => 1),
-				'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen" />',
+				'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen">',
 			),
 			array(
 				array('TEST' => 2),
-				'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen" />',
+				'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen">',
 			),
 			array(
 				array('TEST' => 3),
-				'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen" />',
+				'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen">',
 			),
 			array(
 				array('TEST' => 4),
-				'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen" />',
+				'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen">',
 			),
 		);
 	}
--- a/tests/user/fixtures/user_loader_no_guest.xml
+++ b/tests/user/fixtures/user_loader_no_guest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>user_permissions</column>
+		<column>username</column>
+		<column>username_clean</column>
+		<column>user_sig</column>
+		<row>
+			<value>2</value>
+			<value></value>
+			<value>Admin</value>
+			<value>admin</value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value></value>
+			<value>Test</value>
+			<value>test</value>
+			<value></value>
+		</row>
+	</table>
+</dataset>
--- a/tests/user/user_loader_no_guest_test.php
+++ b/tests/user/user_loader_no_guest_test.php
@@ -0,0 +1,87 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+class phpbb_user_loader_no_guest_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $user_loader;
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(__DIR__ . '/fixtures/user_loader_no_guest.xml');
+	}
+
+	protected function setUp(): void
+	{
+		parent::setUp();
+
+		$this->db = $this->new_dbal();
+		$this->user_loader = new \phpbb\user_loader($this->db, __DIR__ . '/../../phpBB/', 'php', 'phpbb_users');
+	}
+
+	public function test_load_get()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(1);
+		$this->assertFalse($user);
+
+		$user = $this->user_loader->get_user(2);
+		$this->assertEquals(2, $user['user_id']);
+		$this->assertEquals('Admin', $user['username']);
+	}
+
+	public function test_load_get_unloaded()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(3);
+		$this->assertFalse($user);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_get_invalid()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(9);
+		$this->assertFalse($user);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_get_invalid_query()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(9, true);
+		$this->assertFalse($user);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_user_by_username()
+	{
+		$user_id = $this->user_loader->load_user_by_username('Test');
+		$user = $this->user_loader->get_user($user_id);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+}
--- a/tests/user/user_loader_test.php
+++ b/tests/user/user_loader_test.php
@@ -55,6 +55,32 @@ class phpbb_user_loader_test extends phpbb_database_test_case
 		$this->assertEquals('Test', $user['username']);
 	}

+	public function test_load_get_invalid()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(9);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
+	public function test_load_get_invalid_query()
+	{
+		$this->user_loader->load_users(array(2));
+
+		$user = $this->user_loader->get_user(9, true);
+		$this->assertEquals(1, $user['user_id']);
+		$this->assertEquals('Guest', $user['username']);
+
+		$user = $this->user_loader->get_user(3, true);
+		$this->assertEquals(3, $user['user_id']);
+		$this->assertEquals('Test', $user['username']);
+	}
+
 	public function test_load_user_by_username()
 	{
 		$user_id = $this->user_loader->load_user_by_username('Test');
Author	SHA1	Message	Date
Marc Alexander	b3d593b626	[prep-release-3.3.9] Update changelog for 3.3.9	2022-11-23 20:54:42 +01:00
Marc Alexander	744009882b	[prep-release-3.3.9] Add migration for 3.3.9	2022-11-23 20:53:56 +01:00
Marc Alexander	1c407e8049	[prep-release-3.3.9] Update version numbers to 3.3.9	2022-11-23 20:53:53 +01:00
Marc Alexander	e75ea6642d	Merge pull request #67 from phpbb/ticket/security-274 [ticket/security/274] Reset login keys/session when resetting password	2022-11-22 21:21:24 +01:00
Marc Alexander	0793126dc4	Merge pull request #6426 from Crizz0/ticket/17058 [ticket/17058] Add if-sentence for $encode_eol for email headers	2022-11-14 20:07:27 +01:00
Christian Schnegelberger	9fb2dbb776	[ticket/17058] Add $encode_eol to process() PHPBB3-17058	2022-11-11 23:15:09 +01:00
Christian Schnegelberger	6f034c5215	[ticket/17058] Replace hardcoded PHP_EOL in phpbb_mail() with var PHPBB3-17058	2022-11-11 23:15:09 +01:00
Christian Schnegelberger	0802772f09	[ticket/17058] Add if-sentence for $encode_eol for email headers PHPBB3-17058	2022-11-11 23:15:09 +01:00
Marc Alexander	cd36a68645	[prep-release-3.3.9] Update changelog for 3.3.9-RC1	2022-10-22 20:56:04 +02:00
Marc Alexander	5225ac8a9a	[prep-release-3.3.9] Add migration for 3.3.9-RC1	2022-10-22 20:55:14 +02:00
Marc Alexander	aaaef71b60	[prep-release-3.3.9] Update version numbers to 3.3.9	2022-10-22 20:55:12 +02:00
Marc Alexander	1fe8bbf47a	[prep-release-3.3.9] Update version numbers to 3.3.9-RC1	2022-10-22 20:55:12 +02:00
Marc Alexander	827c135cc9	[ticket/security/274] Reset login keys/session when resetting password SECURITY-274	2022-10-22 15:12:28 +02:00
Marc Alexander	67c41633a2	Merge pull request #6422 from marc1706/ticket/17050 [ticket/17050] Remove trailing slash from generated css includes	2022-10-22 11:34:54 +02:00
Marc Alexander	92cebdd624	Merge pull request #6421 from marc1706/ticket/17051 [ticket/17051] Fallback to default values for possible undefined user data	2022-10-22 11:21:46 +02:00
Marc Alexander	7017c73156	[ticket/17050] Remove trailing slash from generated css includes PHPBB3-17050	2022-10-21 21:40:44 +02:00
Marc Alexander	2e025be53a	[ticket/17051] Fallback to default values for possible undefined user data PHPBB3-17051	2022-10-21 20:18:32 +02:00
Marc Alexander	2126738598	Merge pull request #6418 from marc1706/ticket/17048 [ticket/17048] Update composer dependencies for 3.3.9	2022-10-20 17:17:26 +02:00
Marc Alexander	99286b1fdd	[ticket/17048] Update composer dependencies for 3.3.9 PHPBB3-17048	2022-10-15 23:29:12 +02:00
Marc Alexander	64717d0270	Merge pull request #6414 from imhunterand/patch-1 [ticket/17036] Fix failure to strip Authorization header on HTTP downgrade	2022-09-30 20:07:43 +02:00
ＡＮＤＲＩＨ.Ｕ	f197662653	[ticket/17036] Update guzzle and it's dependencies to latest version PHPBB3-17036	2022-09-25 22:00:49 +02:00
Marc Alexander	e080a8533d	Merge pull request #6415 from marc1706/ticket/17032 [ticket/17032] Prevent endlessly cycling to load user	2022-09-09 07:12:45 +02:00
Marc Alexander	f84e03f646	[ticket/17032] Prevent endlessly cycling to load user PHPBB3-17032	2022-09-08 22:18:13 +02:00
Marc Alexander	7c02b58114	Merge pull request #6413 from rubencm/ticket/17030 [ticket/17030] Fix feed to return valid RFC-3339 dates	2022-08-26 21:46:53 +02:00
Marc Alexander	12256eabb6	Merge pull request #6412 from DaRk1V0iD/ticket/17026 [ticket/17026] Session viewonline not defined in Memberlist	2022-08-26 20:47:07 +02:00
Dark❶	9b1bae858f	[ticket/17026] Session viewonline not defined in Memberlist PHPBB3-17026	2022-08-26 10:55:20 +05:30
Ruben Calvo	db3c143b73	[ticket/17030] Fix feed to return valid RFC-3339 dates PHPBB3-17030	2022-08-21 21:56:11 +02:00
Dark❶	ea19638f4e	[ticket/17026] Session viewonline not defined in Memberlist PHPBB3-17026	2022-08-12 20:40:52 +05:30
Marc Alexander	89b07af756	Merge pull request #6406 from Noxwizard/ticket/17003 [ticket/17003] Include topic icon on UCP front page	2022-07-28 20:11:19 +02:00
Marc Alexander	7275f9e7f1	[ticket/17003] Small code style adjustmens PHPBB3-17003	2022-07-27 18:17:46 +02:00
Marc Alexander	8fbbaf97ab	Merge pull request #6408 from Crizz0/ticket/17023 [ticket/17023] Adds PHP >=8.0 to composer require php version	2022-07-23 16:41:24 -04:00
Marc Alexander	b8a3d8f25d	[ticket/17023] Update composer.lock as well PHPBB3-17023	2022-07-22 20:16:11 -05:00
Christian Schnegelberger	495986ff5d	[ticket/17023] Adds PHP >=8.0 to composer require php version PHPBB3-17023	2022-07-19 17:47:53 +02:00
Marc Alexander	3ed3abb446	Merge pull request #6407 from Noxwizard/ticket/16917 [ticket/16917] Update phpbbcli.php's permissions in release archive	2022-07-16 19:02:52 -04:00
Marc Alexander	ca8c402796	Merge pull request #6405 from Noxwizard/ticket/16916 [ticket/16916] Include PHP version number in startup/install error	2022-07-16 18:47:56 -04:00
Marc Alexander	fafe250b0d	Merge pull request #6404 from marc1706/ticket/17019 [ticket/17019] Treat removed youtube profile field as effectively installed	2022-07-16 18:44:56 -04:00
Marc Alexander	256ea96cd9	Merge pull request #6403 from marc1706/ticket/17006 [ticket/17006] Remove www. from server domain name example	2022-07-16 18:43:30 -04:00
Marc Alexander	5cdd22e058	Merge pull request #6402 from marc1706/ticket/16932 [ticket/16932] Ensure special characters are encoded for ASCII in emails	2022-07-16 18:39:02 -04:00
Patrick Webster	47e30a2e21	[ticket/16917] Update phpbbcli.php's permissions in release archive For those employing cron on *nix, these will be the expected permissions. PHPBB3-16917	2022-07-09 15:46:31 -05:00
Patrick Webster	040c2e9b78	[ticket/17003] Include topic icon on UCP front page Prosilver already supports rendering topic icons on this view, but the backend didn't populate the needed topicrow values. PHPBB3-17003	2022-07-09 14:57:01 -05:00
Patrick Webster	2c661205e4	[ticket/16916] Include PHP version number in startup/install error If the PHP version is too low, an error is displayed. This error does not include the current PHP version number, which often becomes a debate with users who believe they are running a supported version. PHPBB3-16916	2022-07-04 21:12:43 -05:00
Marc Alexander	b5d2ff4074	[ticket/17019] Treat removed youtube profile field as effectively installed PHPBB3-17019	2022-06-30 21:35:50 +02:00
Marc Alexander	b3d93a09f2	[ticket/17006] Remove www. from server domain name example PHPBB3-17006	2022-06-28 21:49:01 +02:00
Marc Alexander	2f72950d2d	Merge pull request #6401 from marc1706/ticket/17005 [ticket/17005] Add missing slash to li closing tag	2022-06-28 21:42:58 +02:00
Marc Alexander	064a96ec07	[ticket/16932] Ensure special characters are encoded for ASCII in emails PHPBB3-16932	2022-06-27 22:36:25 +02:00
Marc Alexander	a8feaeafe8	[ticket/17005] Add missing slash to li closing tag PHPBB3-17005	2022-06-27 21:00:58 +02:00
Marc Alexander	fc83f213d5	Merge branch 'prep-release-3.3.8' into 3.3.x	2022-06-26 20:28:13 +02:00
Marc Alexander	5e3dd4b55e	[prep-release-3.3.8] Add migration for 3.3.8	2022-06-26 09:39:25 +02:00
Marc Alexander	53e5113893	[prep-release-3.3.8] Update version numbers to 3.3.8	2022-06-26 09:39:23 +02:00
Marc Alexander	f930f8821f	[3.3.x] Update versions to 3.3.9-dev	2022-06-06 22:54:43 +02:00
Marc Alexander	b84b875cd2	Merge branch 'prep-release-3.3.8' into 3.3.x	2022-06-06 22:53:26 +02:00