Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* @brief Weight input class for Form Builder
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @subpackage Nexus
|
||||
* @since 14 Feb 2014
|
||||
* @version SVN_VERSION_NUMBER
|
||||
@@ -46,7 +46,7 @@ class _Weight extends \IPS\Helpers\Form\FormAbstract
|
||||
public function html()
|
||||
{
|
||||
$unit = \IPS\nexus\Shipping\Weight::bestUnit();
|
||||
return \IPS\Theme::i()->getTemplate( 'forms', 'nexus', 'global' )->weight( $this->name, $this->value ? round( $this->value->float( $unit ), $this->options['round'] ) : 0, $unit, $this->options['unlimitedLang'], $this->value === '*' );
|
||||
return \IPS\Theme::i()->getTemplate( 'forms', 'nexus', 'global' )->weight( $this->name, ( $this->value and $this->value !== '*' ) ? round( $this->value->float( $unit ), $this->options['round'] ) : 0, $unit, $this->options['unlimitedLang'], $this->value === '*' );
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -62,7 +62,7 @@ class _Weight extends \IPS\Helpers\Form\FormAbstract
|
||||
return $val;
|
||||
}
|
||||
|
||||
if ( $this->options['unlimitedLang'] and isset( $val['unlimited'] ) )
|
||||
if ( $this->options['unlimitedLang'] and ( $val === '*' or isset( $val['unlimited'] ) ) )
|
||||
{
|
||||
return '*';
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user