From 8e4721d0712d2f51a62c32bc049145de2478f4c7 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Fri, 14 Apr 2017 18:49:56 +0800
Subject: [PATCH]
---
extend/fast/Tree.php | 2 +-
extend/fast/service/Upyun.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extend/fast/Tree.php b/extend/fast/Tree.php
index 752eb6e..4995862 100644
--- a/extend/fast/Tree.php
+++ b/extend/fast/Tree.php
@@ -354,7 +354,7 @@ class Tree
$value = array(
'@childlist' => $childlist,
'@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'] : '',
'@class' => ($selected ? ' active' : '') . ($disabled ? ' disabled' : '') . ($childdata ? ' treeview' : ''),
);
diff --git a/extend/fast/service/Upyun.php b/extend/fast/service/Upyun.php
index 2155aee..eaddea0 100644
--- a/extend/fast/service/Upyun.php
+++ b/extend/fast/service/Upyun.php
@@ -106,14 +106,14 @@ class Upyun
/**
* 上传文件
- * @param string $path 存储路径
+ * @param string $path 存储路径或文件
* @param mixed $file 需要上传的文件，可以是文件流或者文件内容
* @param boolean $auto_mkdir 自动创建目录
* @param array $opts 可选参数
*/
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)
--
libgit2 0.24.0