Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -4,15 +4,15 @@
|
||||
* Invision Power Services
|
||||
* IP.Board v3.2.0
|
||||
* Custom Profile Fields
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2012-09-21 10:15:19 -0400 (Fri, 21 Sep 2012) $
|
||||
* </pre>
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: mark $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 10914 $
|
||||
* @version $Rev: 11360 $
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -208,7 +208,7 @@ class customProfileFields
|
||||
* @param bool $mlist Whether this is the memberlist or not
|
||||
* @return @e void
|
||||
*/
|
||||
public function initData( $type='view', $mlist=0 )
|
||||
public function initData( $type='view', $mlist=0, $attributes=array() )
|
||||
{
|
||||
/* Store Type */
|
||||
$this->type = $type;
|
||||
@@ -322,6 +322,18 @@ class customProfileFields
|
||||
'format' => isset( $v['pf_input_format'] ) ? $v['pf_input_format'] : '',
|
||||
'urlfilter' => isset( $v['pf_filtering'] ) ? $v['pf_filtering'] : '',
|
||||
);
|
||||
|
||||
if ( !empty( $attributes ) )
|
||||
{
|
||||
if ( !isset( $this->cache_data[$k]['attributes'] ) )
|
||||
{
|
||||
$this->cache_data[$k]['attributes'] = $attributes;
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->cache_data[$k]['attributes'] = array_merge( $this->cache_data[$k]['attributes'], $attributes );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Kernel profile field class */
|
||||
@@ -331,7 +343,7 @@ class customProfileFields
|
||||
|
||||
IPSDebug::setMemoryDebugFlag( "Get CustomFields Kernel Class", $_NOW );
|
||||
|
||||
$this->cfields_obj = new $classToLoad( $this->cache_data, $type );
|
||||
$this->cfields_obj = new $classToLoad( $this->cache_data, $type, $attributes );
|
||||
$this->cfields = $this->cfields_obj->cfields;
|
||||
|
||||
$this->init = 1;
|
||||
@@ -549,7 +561,7 @@ class customProfileFields
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
$this->out_fields[ $id ] = $field->getValue();
|
||||
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user