makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12334] Changed from valueid to value_raw

Browse source 
PHPBB3-12334
This commit is contained in:
PayBas 2014-04-30 10:08:21 +02:00 • committed by Shitiz Garg
parent 507eca319d
commit 2b451a174b
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/phpbb/profilefields/manager.php
View file

@ -389,7 +389,7 @@ class manager
{ {
$profile_field = $this->type_collection[$ident_ary['data']['field_type']]; $profile_field = $this->type_collection[$ident_ary['data']['field_type']];
$value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']); $value = $profile_field->get_profile_value($ident_ary['value'], $ident_ary['data']);
$valueid = $profile_field->get_profile_valueid($ident_ary['value'], $ident_ary['data']); $value_raw = $profile_field->get_profile_value_raw($ident_ary['value'], $ident_ary['data']);
if ($value === null) if ($value === null)
{ {
@ -415,7 +415,7 @@ class manager
$tpl_fields['row'] += array( $tpl_fields['row'] += array(
'PROFILE_' . strtoupper($ident) . '_IDENT' => $ident, 'PROFILE_' . strtoupper($ident) . '_IDENT' => $ident,
'PROFILE_' . strtoupper($ident) . '_VALUE' => $value, 'PROFILE_' . strtoupper($ident) . '_VALUE' => $value,
'PROFILE_' . strtoupper($ident) . '_VALUEID' => $valueid, 'PROFILE_' . strtoupper($ident) . '_VALUE_RAW' => $value_raw,
'PROFILE_' . strtoupper($ident) . '_CONTACT' => $contact_url, 'PROFILE_' . strtoupper($ident) . '_CONTACT' => $contact_url,
'PROFILE_' . strtoupper($ident) . '_DESC' => $field_desc, 'PROFILE_' . strtoupper($ident) . '_DESC' => $field_desc,
'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'], 'PROFILE_' . strtoupper($ident) . '_TYPE' => $ident_ary['data']['field_type'],
@ -429,7 +429,7 @@ class manager
$tpl_fields['blockrow'][] = array( $tpl_fields['blockrow'][] = array(
'PROFILE_FIELD_IDENT' => $ident, 'PROFILE_FIELD_IDENT' => $ident,
'PROFILE_FIELD_VALUE' => $value, 'PROFILE_FIELD_VALUE' => $value,
'PROFILE_FIELD_VALUEID' => $valueid, 'PROFILE_FIELD_VALUE_RAW' => $value_raw,
'PROFILE_FIELD_CONTACT' => $contact_url, 'PROFILE_FIELD_CONTACT' => $contact_url,
'PROFILE_FIELD_DESC' => $field_desc, 'PROFILE_FIELD_DESC' => $field_desc,
'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'], 'PROFILE_FIELD_TYPE' => $ident_ary['data']['field_type'],

2
phpBB/phpbb/profilefields/type/type_bool.php
View file

@ -180,7 +180,7 @@ class type_bool extends type_base
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function get_profile_valueid($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue']) if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
{ {

2
phpBB/phpbb/profilefields/type/type_date.php
View file

@ -208,7 +208,7 @@ class type_date extends type_base
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function get_profile_valueid($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue']) if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
{ {

2
phpBB/phpbb/profilefields/type/type_dropdown.php
View file

@ -189,7 +189,7 @@ class type_dropdown extends type_base
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function get_profile_valueid($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue']) if ($field_value == $field_data['field_novalue'] && !$field_data['field_show_novalue'])
{ {

2
phpBB/phpbb/profilefields/type/type_int.php
View file

@ -154,7 +154,7 @@ class type_int extends type_base
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function get_profile_valueid($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue']) if (($field_value === '' || $field_value === null) && !$field_data['field_show_novalue'])
{ {

2
phpBB/phpbb/profilefields/type/type_interface.php
View file

@ -100,7 +100,7 @@ interface type_interface
* @param array $field_data Array with requirements of the field * @param array $field_data Array with requirements of the field
* @return mixed Field value ID to display * @return mixed Field value ID to display
*/ */
public function get_profile_valueid($field_value, $field_data); public function get_profile_value_raw($field_value, $field_data);
/** /**
* Get Profile Value for display * Get Profile Value for display

2
phpBB/phpbb/profilefields/type/type_string_common.php
View file

@ -112,7 +112,7 @@ abstract class type_string_common extends type_base
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function get_profile_valueid($field_value, $field_data) public function get_profile_value_raw($field_value, $field_data)
{ {
if (!$field_value && !$field_data['field_show_novalue']) if (!$field_value && !$field_data['field_show_novalue'])
{ {