Version 5.0.0 beta 2
This commit is contained in:
1 parent
15c7beabc5
commit
f61b0da85d
181 files changed
+3182
-1533
No files matched your search
@@ -80,7 +80,7 @@ class GroupSettings extends GroupFormAbstract
|
||||
$color = NULL;
|
||||
if ( preg_match( '/^<span style=\'color:#((?:(?:[a-f0-9]{3})|(?:[a-f0-9]{6})))\'>$/i', $element->value['prefix'], $matches ) and $element->value['suffix'] === '</span>' )
|
||||
{
|
||||
$color = $matches[1];
|
||||
$color = '#' . $matches[1];
|
||||
$element->value['prefix'] = NULL;
|
||||
$element->value['suffix'] = NULL;
|
||||
}
|
||||
@@ -89,7 +89,7 @@ class GroupSettings extends GroupFormAbstract
|
||||
},
|
||||
'formatValue' => function( $element )
|
||||
{
|
||||
if ( isset( $element->value['prefix'] ) or isset( $element->value['suffix'] ) )
|
||||
if ( !empty( $element->value['prefix'] ) or !empty( $element->value['suffix'] ) )
|
||||
{
|
||||
return array( 'prefix' => $element->value['prefix'], 'suffix' => $element->value['suffix'] );
|
||||
}
|
||||
@@ -100,7 +100,7 @@ class GroupSettings extends GroupFormAbstract
|
||||
{
|
||||
$color = '#' . $color;
|
||||
}
|
||||
|
||||
|
||||
if( !in_array( $color, array( '#fff', '#ffffff', '#000', '#000000' ) ) )
|
||||
{
|
||||
return array( 'prefix' => "<span style='color:{$color}'>", 'suffix' => '</span>' );
|
||||
|
||||
@@ -40,7 +40,7 @@ class Dnames extends IpAddressesAbstract
|
||||
*/
|
||||
public function pruneIpAddresses( int $time ) : void
|
||||
{
|
||||
Db::i()->update('core_member_history', [ 'log_ip_address=?', '' ] , [ 'log_ip_address != "" AND log_type=? AND log_date <?', 'display_name', $time ] );
|
||||
Db::i()->update('core_member_history', [ 'log_ip_address' => '' ] , [ 'log_ip_address != ? AND log_type=? AND log_date <?', '', 'display_name', $time ] );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user