mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/12169] Convert user_from to profile field location

Browse Source 
Missing changes on memberlist view due to missing functionality

PHPBB3-12169
This commit is contained in:
Joas Schilling
2014-02-06 15:00:49 +01:00
parent b088bf864b
commit 6bee91c429
24 changed files with 64 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_profile.php
View File

@@ -270,7 +270,6 @@ class ucp_profile
'yim' => request_var('yim', $user->data['user_yim']),
'jabber' => utf8_normalize_nfc(request_var('jabber', $user->data['user_jabber'], true)),
'website' => request_var('website', $user->data['user_website']),
'location' => utf8_normalize_nfc(request_var('location', $user->data['user_from'], true)),
);
if ($config['allow_birthdays'])
@@ -305,7 +304,6 @@ class ucp_profile
'website' => array(
array('string', true, 12, 255),
array('match', true, '#^http[s]?://(.*?\.)*?[a-z0-9\-]+\.[a-z]{2,4}#i')),
'location' => array('string', true, 2, 100),
);
if ($config['allow_birthdays'])
@@ -351,7 +349,6 @@ class ucp_profile
'user_yim' => $data['yim'],
'user_jabber' => $data['jabber'],
'user_website' => $data['website'],
'user_from' => $data['location'],
'user_notify_type' => $data['notify'],
);
@@ -420,7 +417,6 @@ class ucp_profile
'MSN' => $data['msn'],
'JABBER' => $data['jabber'],
'WEBSITE' => $data['website'],
'LOCATION' => $data['location'],
));
// Get additional profile fields and assign them to the template block var 'profile_fields'