diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-02-06 15:00:49 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-02-10 14:38:43 +0100 |
| commit | 6bee91c42915dd613e9714016006b25fa51cb24a (patch) | |
| tree | ad948bc477c7045144c1b9168a3921f472a06f2d /phpBB/includes/ucp | |
| parent | b088bf864bf5827c1801c53c0af1b5a2f89f5b16 (diff) | |
| download | forums-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/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 119b84564a..f9e8e3155e 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -188,7 +188,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '', 'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']), 'AUTHOR_POSTS' => (int) $user_info['user_posts'], - 'AUTHOR_FROM' => (!empty($user_info['user_from'])) ? $user_info['user_from'] : '', 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])), 'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false), diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 22b180ba89..8def48b1b4 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -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' |