Version 5.0.0 beta 5
This commit is contained in:
1 parent
2f24f9de48
commit
57d9db6ce2
218 files changed
+5331
-7416
No files matched your search
@@ -561,7 +561,7 @@ abstract class Dynamic extends Chart
|
||||
|
||||
if( !Request::i()->isAjax() OR ( Request::i()->tab AND !Request::i()->chartId ) )
|
||||
{
|
||||
return Theme::i()->getTemplate( 'global', 'core' )->tabs( $this->getChartTabs(), ( isset( Request::i()->chartId ) ) ? Request::i()->chartId : NULL, $chartOutput, $this->url, 'chartId', 'ipsTabs_small ipsTabs_contained' );
|
||||
return Theme::i()->getTemplate( 'global', 'core' )->tabs( $this->getChartTabs(), ( isset( Request::i()->chartId ) ) ? Request::i()->chartId : NULL, $chartOutput, $this->url, 'chartId', 'ipsTabs--small' );
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -457,13 +457,14 @@ class Upload extends FormAbstract
|
||||
/* Set existing files */
|
||||
if ( $this->options['temporary'] )
|
||||
{
|
||||
$fileSize = mb_strlen( file_get_contents( $file ) );
|
||||
$existing[] = array(
|
||||
'id' => $id,
|
||||
'insertable' => (bool) $this->options['postKey'],
|
||||
'hasThumb' => false,
|
||||
'originalFileName' => $file,
|
||||
'size' => Filesize::humanReadableFilesize( $file, FALSE, TRUE ),
|
||||
'sizeRaw' => $file,
|
||||
'size' => Filesize::humanReadableFilesize( $fileSize, FALSE, TRUE ),
|
||||
'sizeRaw' => $fileSize,
|
||||
'custom' => NULL
|
||||
);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user