aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/convertors
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-02-06 15:00:49 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-02-10 14:38:43 +0100
commit6bee91c42915dd613e9714016006b25fa51cb24a (patch)
treead948bc477c7045144c1b9168a3921f472a06f2d /phpBB/install/convertors
parentb088bf864bf5827c1801c53c0af1b5a2f89f5b16 (diff)
downloadforums-6bee91c42915dd613e9714016006b25fa51cb24a.tar
forums-6bee91c42915dd613e9714016006b25fa51cb24a.tar.gz
forums-6bee91c42915dd613e9714016006b25fa51cb24a.tar.bz2
forums-6bee91c42915dd613e9714016006b25fa51cb24a.tar.xz
forums-6bee91c42915dd613e9714016006b25fa51cb24a.zip
[ticket/12169] Convert user_from to profile field location
Missing changes on memberlist view due to missing functionality PHPBB3-12169
Diffstat (limited to 'phpBB/install/convertors')
-rw-r--r--phpBB/install/convertors/convert_phpbb20.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 2effbf49b9..94f685fa2f 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -912,7 +912,6 @@ if (!$get_info)
array('user_yim', 'users.user_yim', array('function1' => 'phpbb_set_encoding')),
array('user_aim', 'users.user_aim', array('function1' => 'phpbb_set_encoding')),
array('user_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')),
- array('user_from', 'users.user_from', array('function1' => 'phpbb_set_encoding')),
array('user_rank', 'users.user_rank', 'intval'),
array('user_permissions', '', ''),
@@ -963,6 +962,7 @@ if (!$get_info)
array('user_id', 'users.user_id', 'phpbb_user_id'),
array('pf_phpbb_occupation', 'users.user_occ', array('function1' => 'phpbb_set_encoding')),
array('pf_phpbb_interests', 'users.user_interests', array('function1' => 'phpbb_set_encoding')),
+ array('pf_phpbb_location', 'users.user_from', array('function1' => 'phpbb_set_encoding')),
'where' => 'users.user_id <> -1',
),