6 files changed, 17 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index fe03efddf2..22c1a092b5 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -31,7 +31,7 @@ function phpbb_load_extensions_autoloaders($phpbb_root_path)
 		new \phpbb\recursive_dot_prefix_filter_iterator(
 			new \RecursiveDirectoryIterator(
 				$phpbb_root_path . 'ext/',
-				\FilesystemIterator::SKIP_DOTS
+				\FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS
 			)
 		),
 		\RecursiveIteratorIterator::SELF_FIRST
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php
index 3567570137..0781d7425e 100644
--- a/phpBB/phpbb/db/tools.php
+++ b/phpBB/phpbb/db/tools.php
@@ -1512,7 +1512,7 @@ class tools
 					$sql .= (strpos($column_data[1], '0x') === 0) ? "DEFAULT {$column_data[1]} " : "DEFAULT '{$column_data[1]}' ";
 				}
 
-				if (!is_null($column_data[1]))
+				if (!is_null($column_data[1]) || (isset($column_data[2]) && $column_data[2] == 'auto_increment'))
 				{
 					$sql .= 'NOT NULL';
 				}
diff --git a/phpBB/phpbb/profilefields/type/type_base.php b/phpBB/phpbb/profilefields/type/type_base.php
index c770a0d93c..52f5d15511 100644
--- a/phpBB/phpbb/profilefields/type/type_base.php
+++ b/phpBB/phpbb/profilefields/type/type_base.php
@@ -133,7 +133,7 @@ abstract class type_base implements type_interface
 		{
 			foreach ($field_data[$key] as $lang_id => $options)
 			{
-				$field_data[$key][$lang_id] = explode("\n", $options);
+				$field_data[$key][$lang_id] = is_array($options) ? $options : explode("\n", $options);
 			}
 
 			return $current_value;
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php
index ea98034434..882e9cef26 100644
--- a/phpBB/phpbb/user.php
+++ b/phpBB/phpbb/user.php
@@ -717,7 +717,7 @@ class user extends \phpbb\session
 			$utc = new \DateTimeZone('UTC');
 		}
 
-		$time = new \phpbb\datetime($this, "@$gmepoch", $utc);
+		$time = new $this->datetime($this, "@$gmepoch", $utc);
 		$time->setTimezone($this->timezone);
 
 		return $time->format($format, $forcedate);
diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php
index 0f87abc180..f10402e8cb 100644
--- a/tests/datetime/from_format_test.php
+++ b/tests/datetime/from_format_test.php
@@ -60,7 +60,7 @@ class phpbb_datetime_from_format_test extends phpbb_test_case
 		// If the current time is too close to the testing time,
 		// the relative time will use "x minutes ago" instead of "today ..."
 		// So we use 18:01 in the morning and 06:01 in the afternoon.
-		$testing_time = date('H') <= 12 ? '06:01' : '18:01';
+		$testing_time = date('H') <= 12 ? '18:01' : '06:01';
 
 		return array(
 			array(
diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php
index dc0e38544d..2e55a78d21 100644
--- a/tests/wrapper/gmgetdate_test.php
+++ b/tests/wrapper/gmgetdate_test.php
@@ -50,7 +50,18 @@ class phpbb_wrapper_gmgetdate_test extends phpbb_test_case
 			$date_array['year']
 		);
 
-		$this->assertEquals($expected, $actual);
+		// Calling second-granularity time functions twice isn't guaranteed to
+		// give the same results. As long as they're in the right order, allow
+		// a 1 second difference.
+		$this->assertGreaterThanOrEqual(
+			$expected, $actual,
+			'Expected second time to be after (or equal to) the previous one'
+		);
+		$this->assertLessThanOrEqual(
+			1,
+			abs($actual - $expected),
+			"Expected $actual to be within 1 second of $expected."
+		);
 
 		if (isset($current_timezone))
 		{