Skip to content
Permalink
Browse files

Merge branch 'release/2.3'

# Conflicts:
#	composer.json
#	index.php
  • Loading branch information...
fengkaijia committed Aug 3, 2019
2 parents 9bb0a93 + 273808f commit 51721cead8c8963e9507a9bef952af2789149b28
@@ -791,7 +791,7 @@ function export($action = 'guide')
}
if(count($note_ids) > $note_count)
$note_count = count($note_count);
$note_count = count($note_ids);
}
}
}
@@ -1260,11 +1260,11 @@ function document()
//去除空格式
foreach($formats as $format_id => $format)
{
$files = $this->document_model->get_file_ids('format', $format_id, 'document', $document_ids, array('group_by' => 'document'));
$files = $this->document_model->get_file_ids('format', $format_id, 'document', $document_ids);
if(!$files)
unset($formats[$format_id]);
else
$formats[$format_id]['count'] = count($files);
$formats[$format_id]['count'] = count(array_unique(array_column($this->document_model->get_files($files), 'document')));
}
$vars['formats'] = $formats;
@@ -1796,7 +1796,6 @@ function operation($action, $uid)
$this->invoice->item(option('invoice_title_fee_delegate', option('invoice_title_fee', '参会会费')), option('invoice_amount_delegate', 1000), option('invoice_item_fee_delegate', option('invoice_item_fee', array())));
$this->invoice->due_time(time() + option('invoice_due_fee', 15) * 24 * 60 * 60);
$this->invoice->trigger('overdue', 'release_seat', array('delegate' => $uid));
$this->invoice->trigger('receive', 'change_status', array('delegate' => $uid, 'status' => 'payment_received'));
$this->invoice->generate();
@@ -13,9 +13,9 @@
class IP_Upload extends CI_Upload {
/**
* @var string 禁用文件类型
* @var array 禁用文件类型
*/
var $disallowed_types = '';
var $disallowed_types = array();
/**
* 初始化
@@ -49,10 +49,10 @@ public function set_disallowed_types($types)
public function is_allowed_filetype($ignore_mime = FALSE)
{
//未设定白名单
if(count($this->allowed_types) == 0 || !is_array($this->allowed_types))
if(empty($this->allowed_types) || !is_array($this->allowed_types))
{
//未设定黑白名单允许全部
if(count($this->disallowed_types) == 0 || !is_array($this->disallowed_types))
if(empty($this->disallowed_types) || !is_array($this->disallowed_types))
return TRUE;
//未设定黑名单
@@ -70,7 +70,7 @@ public function is_allowed_filetype($ignore_mime = FALSE)
public function is_disallowed_filetype()
{
//无后缀
if(count($this->disallowed_types) == 0 || !is_array($this->disallowed_types))
if(empty($this->disallowed_types) || !is_array($this->disallowed_types))
return FALSE;
foreach($this->disallowed_types as $val)

0 comments on commit 51721ce

Please sign in to comment.
You can’t perform that action at this time.