From 453fa2f0c1f6712c9d64231d97c30203fa924226 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Sat, 2 Jun 2007 16:39:27 +0000
Subject: [PATCH] changed the treatment for some profile fields. Thanks to the
videolan team for bringing this up.
git-svn-id: file:///svn/phpbb/trunk@7704 89ea8834-ac86-4346-8a33-228a782c2dd0
---
phpBB/docs/CHANGELOG.html | 2 ++
phpBB/install/convertors/convert_phpbb20.php | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index bc1fd6ea16..b97491ae81 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -232,6 +232,8 @@ p a {
<li>Some changes to the conversion documentation</li>
<li>[Fix] Only use permissions from existing forums during the conversion (Bug #11417)</li>
<li>[Fix] Do not permit the decimal as a valid prefix character (Bug #11967)</li>
+ <li>[Fix] Account for the fact that the IM fields might hold non-IM information</li>
+
</ul>
</div>
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index a750c807d3..5585a8075f 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -851,7 +851,7 @@ if (!$get_info)
array('user_lang', $config['default_lang'], ''),
array('', 'users.user_lang', ''),
array('user_timezone', 'users.user_timezone', ''),
- array('user_dateformat', 'users.user_dateformat', ''),
+ array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding')),
array('user_inactive_reason', '', 'phpbb_inactive_reason'),
array('user_inactive_time', '', 'phpbb_inactive_time'),
@@ -859,10 +859,10 @@ if (!$get_info)
array('user_occ', 'users.user_occ', array('function1' => 'phpbb_set_encoding')),
array('user_website', 'users.user_website', 'validate_website'),
array('user_jabber', '', ''),
- array('user_msnm', 'users.user_msnm', ''),
- array('user_yim', 'users.user_yim', ''),
- array('user_aim', 'users.user_aim', ''),
- array('user_icq', 'users.user_icq', ''),
+ array('user_msnm', 'users.user_msnm', array('function1' => 'phpbb_set_encoding')),
+ 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', ''),
array('user_permissions', '', ''),