diff --git a/var/Typecho/I18n.php b/var/Typecho/I18n.php
index dbbdd11a..e50e7b92 100644
--- a/var/Typecho/I18n.php
+++ b/var/Typecho/I18n.php
@@ -153,7 +153,7 @@ class Typecho_I18n
/** 如果是一个星期 */
if ($between > 0 && $between < 604800) {
$day = floor($between / 86400);
- return str_replace('%d', $day, _n('一天前', '%天前', $day));
+ return str_replace('%d', $day, _n('一天前', '%d天前', $day));
}
/** 如果是 */
diff --git a/var/Widget/Options.php b/var/Widget/Options.php
index 9d6e258a..3264840b 100644
--- a/var/Widget/Options.php
+++ b/var/Widget/Options.php
@@ -319,7 +319,7 @@ class Widget_Options extends Typecho_Widget
if (NULL != $this->attachmentTypes) {
$attachmentTypes = str_replace(
array('@image@', '@media@', '@doc@'),
- array('gif,jpg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
+ array('gif,jpg,jpeg,png,tiff,bmp', 'mp3,wmv,wma,rmvb,rm,avi,flv',
'txt,doc,docx,xls,xlsx,ppt,pptx,zip,rar,pdf'), $this->attachmentTypes);
$attachmentTypesResult = array_unique(array_map('trim', explode(',', $attachmentTypes)));
diff --git a/var/Widget/Options/General.php b/var/Widget/Options/General.php
index 5d0bced3..13ebef36 100644
--- a/var/Widget/Options/General.php
+++ b/var/Widget/Options/General.php
@@ -116,7 +116,7 @@ class Widget_Options_General extends Widget_Abstract_Options implements Widget_I
}
$attachmentTypesOptions = array(
- '@image@' => _t('图片文件') . ' (gif jpg png tiff bmp)',
+ '@image@' => _t('图片文件') . ' (gif jpg jpeg png tiff bmp)',
'@media@' => _t('多媒体文件') . ' (mp3 wmv wma rmvb rm avi flv)',
'@doc@' => _t('常用档案文件') . ' (txt doc docx xls xlsx ppt pptx zip rar pdf)',
'@other@' => _t('其他格式 %s', ' '),
diff --git a/var/Widget/Upload.php b/var/Widget/Upload.php
index 629dfa8a..fbc06058 100644
--- a/var/Widget/Upload.php
+++ b/var/Widget/Upload.php
@@ -19,7 +19,7 @@
class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface_Do
{
//上传文件目录
- const UPLOAD_PATH = '/usr/uploads';
+ const UPLOAD_DIR = '/usr/uploads';
/**
* 创建上传路径
@@ -75,8 +75,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
$options = Typecho_Widget::widget('Widget_Options');
$date = new Typecho_Date($options->gmtTime);
- $path = Typecho_Common::url(self::UPLOAD_PATH, __TYPECHO_ROOT_DIR__)
- . '/' . $date->year . '/' . $date->month;
+ $path = Typecho_Common::url(defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR,
+ __TYPECHO_ROOT_DIR__) . '/' . $date->year . '/' . $date->month;
//创建上传目录
if (!is_dir($path)) {
@@ -112,7 +112,8 @@ class Widget_Upload extends Widget_Abstract_Contents implements Widget_Interface
//返回相对存储路径
return array(
'name' => $file['name'],
- 'path' => self::UPLOAD_PATH . '/' . $date->year . '/' . $date->month . '/' . $fileName,
+ 'path' => (defined('__TYPECHO_UPLOAD_DIR__') ? __TYPECHO_UPLOAD_DIR__ : self::UPLOAD_DIR)
+ . '/' . $date->year . '/' . $date->month . '/' . $fileName,
'size' => $file['size'],
'type' => $ext,
'mime' => Typecho_Common::mimeContentType($path)