diff options
author | Marc Alexander <admin@m-a-styles.de> | 2018-06-17 15:40:00 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2018-06-17 15:40:00 +0200 |
commit | 7245bc9977235d7165d35a5671ccb5b22fc042e2 (patch) | |
tree | cdf1317a0f4350402ba00f98bde2eec1efd1df87 /phpBB/phpbb | |
parent | 8b7ae7c796d9ffb9083502b869ecac0e15f73d58 (diff) | |
parent | ecf19b13c81c4db3aea7f5daa5e4e35994b3e689 (diff) | |
download | forums-7245bc9977235d7165d35a5671ccb5b22fc042e2.tar forums-7245bc9977235d7165d35a5671ccb5b22fc042e2.tar.gz forums-7245bc9977235d7165d35a5671ccb5b22fc042e2.tar.bz2 forums-7245bc9977235d7165d35a5671ccb5b22fc042e2.tar.xz forums-7245bc9977235d7165d35a5671ccb5b22fc042e2.zip |
Merge branch 'prep-release-3.2.3' into 3.2.x
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 6 |
1 files changed, 0 insertions, 6 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 |