hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

pull/269678/MERGE
Karson 2017-04-14 18:49:56 +08:00
parent 7ed5b5c6af
commit 8e4721d071
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extend/fast/Tree.php
View File

@ -354,7 +354,7 @@ class Tree
$value = array( $value = array(
'@childlist' => $childlist, '@childlist' => $childlist,
'@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']), '@url' => $childdata || !isset($value['@url']) ? "javascript:;" : url($value['@url']),
'@caret' => ($childdata && !$value['@badge'] ? '<i class="fa fa-angle-left"></i>' : ''), '@caret' => ($childdata && (!isset($value['@badge']) || !$value['@badge']) ? '<i class="fa fa-angle-left"></i>' : ''),
'@badge' => isset($value['@badge']) ? $value['@badge'] : '', '@badge' => isset($value['@badge']) ? $value['@badge'] : '',
'@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''), '@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''),
); );

4
extend/fast/service/Upyun.php
View File

@ -106,14 +106,14 @@ class Upyun
/** /**
* 上传文件 * 上传文件
* @param string $path 存储路径 * @param string $path 存储路径或文件
* @param mixed $file 需要上传的文件，可以是文件流或者文件内容 * @param mixed $file 需要上传的文件，可以是文件流或者文件内容
* @param boolean $auto_mkdir 自动创建目录 * @param boolean $auto_mkdir 自动创建目录
* @param array $opts 可选参数 * @param array $opts 可选参数
*/ */
public function upload($path, $file = NULL, $auto_mkdir = True, $opts = NULL) public function upload($path, $file = NULL, $auto_mkdir = True, $opts = NULL)
{ {
return $this->writeFile($path, $file = NULL, $auto_mkdir, $opts); return $this->writeFile($path, $file, $auto_mkdir, $opts);
} }
public function writeFile($path, $file = NULL, $auto_mkdir = True, $opts = NULL) public function writeFile($path, $file = NULL, $auto_mkdir = True, $opts = NULL)