3 files changed, 3 insertions, 9 deletions
diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php
index e24c78e228..3893935723 100644
--- a/phpBB/phpbb/db/migration/tool/module.php
+++ b/phpBB/phpbb/db/migration/tool/module.php
@@ -519,12 +519,6 @@ class module implements \phpbb\db\migration\tool\tool_interface
 		// Allow '' to be sent as 0
 		$parent_id = $parent_id ?: 0;
 
-		// If automatic adding is in action, convert array back to string to simplify things
-		if (is_array($data) && count($data) == 1)
-		{
-			$data = $data['module_langname'];
-		}
-
 		if (!is_numeric($parent_id))
 		{
 			// Refresh the $module_categories array
diff --git a/phpBB/phpbb/debug/error_handler.php b/phpBB/phpbb/debug/error_handler.php
index 246e724f56..ebd828b97f 100644
--- a/phpBB/phpbb/debug/error_handler.php
+++ b/phpBB/phpbb/debug/error_handler.php
@@ -17,7 +17,7 @@ use Symfony\Component\Debug\ErrorHandler;
 
 class error_handler extends ErrorHandler
 {
-	public function handleError($type, $message, $file, $line, array $context, array $backtrace = null)
+	public function handleError($type, $message, $file, $line)
 	{
 		if ($type === E_USER_WARNING || $type === E_USER_NOTICE)
 		{
@@ -26,6 +26,6 @@ class error_handler extends ErrorHandler
 			$handler($type, $message, $file, $line);
 		}
 
-		return parent::handleError($type, $message, $file, $line, $context, $backtrace);
+		return parent::handleError($type, $message, $file, $line);
 	}
 }
diff --git a/phpBB/phpbb/filesystem/filesystem.php b/phpBB/phpbb/filesystem/filesystem.php
index 3f39448f05..bfafdf5ddd 100644
--- a/phpBB/phpbb/filesystem/filesystem.php
+++ b/phpBB/phpbb/filesystem/filesystem.php
@@ -367,7 +367,7 @@ class filesystem implements filesystem_interface
 				$common_php_group	= @filegroup(__FILE__);
 
 				// And the owner and the groups PHP is running under.
-				$php_uid	= (function_exists('posic_getuid')) ? @posix_getuid() : false;
+				$php_uid	= (function_exists('posix_getuid')) ? @posix_getuid() : false;
 				$php_gids	= (function_exists('posix_getgroups')) ? @posix_getgroups() : false;
 
 				// If we are unable to get owner/group, then do not try to set them by guessing