diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-03 11:21:16 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-03 11:21:16 +0200 |
| commit | 107693ff581970d5d0a147cdd02b1171fc45ff8a (patch) | |
| tree | e2acc1bcfbfef92a45ebf1a63ba274b2618d2c5a /phpBB/phpbb/profilefields/manager.php | |
| parent | ad967b11223fbef297d97e18c9d4b08e4a06acb5 (diff) | |
| parent | b48443969123b630deaec47ac70236fc13287067 (diff) | |
| download | forums-107693ff581970d5d0a147cdd02b1171fc45ff8a.tar forums-107693ff581970d5d0a147cdd02b1171fc45ff8a.tar.gz forums-107693ff581970d5d0a147cdd02b1171fc45ff8a.tar.bz2 forums-107693ff581970d5d0a147cdd02b1171fc45ff8a.tar.xz forums-107693ff581970d5d0a147cdd02b1171fc45ff8a.zip | |
Merge pull request #2647 from Dragooon/ticket/12334
[ticket/12334] Add PROFILE_FIELD_VALUE_RAW template var
* Dragooon/ticket/12334:
[ticket/12334] Remove profile fields test group
[ticket/12334] Add additional test for type_string
[ticket/12334] Add string test for type_int
[ticket/12334] Improve type_dropdown's test description
[ticket/12334] Group profile fields test
[ticket/12334] Change get_profile_value_raw_data to profile_value_raw_data
[ticket/12334] Add get_profile_value_raw unit test for type_bool
[ticket/12334] Add get_profile_value_raw unit test for type_date
[ticket/12334] Add get_profile_value_raw unit tests for type_dropdown
[ticket/12334] Add get_profile_value_raw unit test for type_string
[ticket/12334] Add get_profile_value_raw unit test for type_url
[ticket/12334] Add get_profile_value_raw unit tests for type_int
[ticket/12334] Removed tests
[ticket/12334] Dropdowns cannot be tested this way
[ticket/12334] Added test get_profile_value_raw
[ticket/12334] Changed from valueid to value_raw
[ticket/12334] Implemented get_profile_valueid method
[ticket/12334] Added field_novalue fall-back as requested
[ticket/12334] Add PROFILE_FIELD_VALUEID template var
Diffstat (limited to 'phpBB/phpbb/profilefields/manager.php')
| -rw-r--r-- | phpBB/phpbb/profilefields/manager.php | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/phpBB/phpbb/profilefields/manager.php b/phpBB/phpbb/profilefields/manager.php index 490db0419a..26c11d9e22 100644 --- a/phpBB/phpbb/profilefields/manager.php +++ b/phpBB/phpbb/profilefields/manager.php @@ -389,6 +389,7 @@ class manager { $profile_field = $this->type_collection[$ident_ary['data']['field_type']]; $value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']); + $value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']); if ($value === null) { @@ -412,26 +413,28 @@ class manager } $tpl_fields['row'] += array( - 'PROFILE_' . strtoupper($ident) . '_IDENT' => $ident, - 'PROFILE_' . strtoupper($ident) . '_VALUE' => $value, - 'PROFILE_' . strtoupper($ident) . '_CONTACT'=> $contact_url, - 'PROFILE_' . strtoupper($ident) . '_DESC' => $field_desc, - 'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'], - 'PROFILE_' . strtoupper($ident) . '_NAME' => $this->user->lang($ident_ary['data']['lang_name']), - 'PROFILE_' . strtoupper($ident) . '_EXPLAIN'=> $this->user->lang($ident_ary['data']['lang_explain']), + 'PROFILE_' . strtoupper($ident) . '_IDENT' => $ident, + 'PROFILE_' . strtoupper($ident) . '_VALUE' => $value, + 'PROFILE_' . strtoupper($ident) . '_VALUE_RAW' => $value_raw, + 'PROFILE_' . strtoupper($ident) . '_CONTACT' => $contact_url, + 'PROFILE_' . strtoupper($ident) . '_DESC' => $field_desc, + 'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'], + 'PROFILE_' . strtoupper($ident) . '_NAME' => $this->user->lang($ident_ary['data']['lang_name']), + 'PROFILE_' . strtoupper($ident) . '_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']), 'S_PROFILE_' . strtoupper($ident) . '_CONTACT' => $ident_ary['data']['field_is_contact'], 'S_PROFILE_' . strtoupper($ident) => true, ); $tpl_fields['blockrow'][] = array( - 'PROFILE_FIELD_IDENT' => $ident, - 'PROFILE_FIELD_VALUE' => $value, - 'PROFILE_FIELD_CONTACT' => $contact_url, - 'PROFILE_FIELD_DESC' => $field_desc, - 'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'], - 'PROFILE_FIELD_NAME' => $this->user->lang($ident_ary['data']['lang_name']), - 'PROFILE_FIELD_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']), + 'PROFILE_FIELD_IDENT' => $ident, + 'PROFILE_FIELD_VALUE' => $value, + 'PROFILE_FIELD_VALUE_RAW' => $value_raw, + 'PROFILE_FIELD_CONTACT' => $contact_url, + 'PROFILE_FIELD_DESC' => $field_desc, + 'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'], + 'PROFILE_FIELD_NAME' => $this->user->lang($ident_ary['data']['lang_name']), + 'PROFILE_FIELD_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']), 'S_PROFILE_CONTACT' => $ident_ary['data']['field_is_contact'], 'S_PROFILE_' . strtoupper($ident) => true, |