Version 4.2.0
This commit is contained in:
1 parent
0dc2aee5ed
commit
96997ddd8e
2074 files changed
+125454
-55780
No files matched your search
@@ -1,13 +1,12 @@
|
||||
<?php
|
||||
/**
|
||||
* @brief Customer Model
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Community Suite
|
||||
* @author <a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) Invision Power Services, Inc.
|
||||
* @license https://www.invisioncommunity.com/legal/standards/
|
||||
* @package Invision Community
|
||||
* @subpackage Nexus
|
||||
* @since 11 Feb 2014
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
|
||||
namespace IPS\nexus;
|
||||
@@ -232,7 +231,7 @@ class _Customer extends \IPS\Member
|
||||
*/
|
||||
public function get_cm_profiles()
|
||||
{
|
||||
return $this->_data['cm_profiles'] ? json_decode( $this->_data['cm_profiles'], TRUE ) : array();
|
||||
return ( isset( $this->_data['cm_profiles'] ) and $this->_data['cm_profiles'] ) ? json_decode( $this->_data['cm_profiles'], TRUE ) : array();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -383,22 +382,7 @@ class _Customer extends \IPS\Member
|
||||
*/
|
||||
public function log( $type, $extra=NULL, $by=NULL )
|
||||
{
|
||||
if ( $this->member_id )
|
||||
{
|
||||
if ( $by === NULL )
|
||||
{
|
||||
$by = \IPS\Member::loggedIn();
|
||||
}
|
||||
|
||||
\IPS\Db::i()->insert( 'nexus_customer_history', array(
|
||||
'log_member' => (int) $this->member_id,
|
||||
'log_by' => $by ? $by->member_id : NULL,
|
||||
'log_type' => $type,
|
||||
'log_data' => json_encode( $extra ),
|
||||
'log_date' => microtime( TRUE ),
|
||||
'log_ip_address' => \IPS\Request::i()->ipAddress()
|
||||
) );
|
||||
}
|
||||
$this->logHistory( 'nexus', $type, $extra, $by, TRUE );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user