Skip to content

Commit 2b451a1

Browse files
PayBasDragooon
PayBas
authored and
Dragooon
committed
[ticket/12334] Changed from valueid to value_raw
PHPBB3-12334
1 parent 507eca3 commit 2b451a1

7 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎phpBB/phpbb/profilefields/manager.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ public function generate_profile_fields_template_data($profile_row, $use_contact
389389
{
390390
$profile_field = $this->type_collection[$ident_ary['data']['field_type']];
391391
$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
392-
$valueid = $profile_field->get_profile_valueid($ident_ary['value'], $ident_ary['data']);
392+
$value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
393393

394394
if ($value === null)
395395
{
@@ -415,7 +415,7 @@ public function generate_profile_fields_template_data($profile_row, $use_contact
415415
$tpl_fields['row'] += array(
416416
'PROFILE_' . strtoupper($ident) . '_IDENT' => $ident,
417417
'PROFILE_' . strtoupper($ident) . '_VALUE' => $value,
418-
'PROFILE_' . strtoupper($ident) . '_VALUEID' => $valueid,
418+
'PROFILE_' . strtoupper($ident) . '_VALUE_RAW' => $value_raw,
419419
'PROFILE_' . strtoupper($ident) . '_CONTACT' => $contact_url,
420420
'PROFILE_' . strtoupper($ident) . '_DESC' => $field_desc,
421421
'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'],
@@ -427,14 +427,14 @@ public function generate_profile_fields_template_data($profile_row, $use_contact
427427
);
428428

429429
$tpl_fields['blockrow'][] = array(
430-
'PROFILE_FIELD_IDENT' => $ident,
431-
'PROFILE_FIELD_VALUE' => $value,
432-
'PROFILE_FIELD_VALUEID' => $valueid,
433-
'PROFILE_FIELD_CONTACT' => $contact_url,
434-
'PROFILE_FIELD_DESC' => $field_desc,
435-
'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'],
436-
'PROFILE_FIELD_NAME' => $this->user->lang($ident_ary['data']['lang_name']),
437-
'PROFILE_FIELD_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']),
430+
'PROFILE_FIELD_IDENT' => $ident,
431+
'PROFILE_FIELD_VALUE' => $value,
432+
'PROFILE_FIELD_VALUE_RAW' => $value_raw,
433+
'PROFILE_FIELD_CONTACT' => $contact_url,
434+
'PROFILE_FIELD_DESC' => $field_desc,
435+
'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'],
436+
'PROFILE_FIELD_NAME' => $this->user->lang($ident_ary['data']['lang_name']),
437+
'PROFILE_FIELD_EXPLAIN' => $this->user->lang($ident_ary['data']['lang_explain']),
438438

439439
'S_PROFILE_CONTACT' => $ident_ary['data']['field_is_contact'],
440440
'S_PROFILE_' . strtoupper($ident) => true,

‎phpBB/phpbb/profilefields/type/type_bool.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function get_profile_value($field_value, $field_data)
180180
/**
181181
* {@inheritDoc}
182182
*/
183-
public function get_profile_valueid($field_value, $field_data)
183+
public function get_profile_value_raw($field_value, $field_data)
184184
{
185185
if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
186186
{

‎phpBB/phpbb/profilefields/type/type_date.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function get_profile_value($field_value, $field_data)
208208
/**
209209
* {@inheritDoc}
210210
*/
211-
public function get_profile_valueid($field_value, $field_data)
211+
public function get_profile_value_raw($field_value, $field_data)
212212
{
213213
if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
214214
{

‎phpBB/phpbb/profilefields/type/type_dropdown.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public function get_profile_value($field_value, $field_data)
189189
/**
190190
* {@inheritDoc}
191191
*/
192-
public function get_profile_valueid($field_value, $field_data)
192+
public function get_profile_value_raw($field_value, $field_data)
193193
{
194194
if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
195195
{

‎phpBB/phpbb/profilefields/type/type_int.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function get_profile_value($field_value, $field_data)
154154
/**
155155
* {@inheritDoc}
156156
*/
157-
public function get_profile_valueid($field_value, $field_data)
157+
public function get_profile_value_raw($field_value, $field_data)
158158
{
159159
if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
160160
{

‎phpBB/phpbb/profilefields/type/type_interface.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function get_profile_value($field_value, $field_data);
100100
* @param array $field_data Array with requirements of the field
101101
* @return mixed Field value ID to display
102102
*/
103-
public function get_profile_valueid($field_value, $field_data);
103+
public function get_profile_value_raw($field_value, $field_data);
104104

105105
/**
106106
* Get Profile Value for display

‎phpBB/phpbb/profilefields/type/type_string_common.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function get_profile_value($field_value, $field_data)
112112
/**
113113
* {@inheritDoc}
114114
*/
115-
public function get_profile_valueid($field_value, $field_data)
115+
public function get_profile_value_raw($field_value, $field_data)
116116
{
117117
if (!$field_value && !$field_data['field_show_novalue'])
118118
{

0 commit comments

Comments
 (0)