mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-04-04 18:22:23 +02:00
Code Issues Projects Releases Wiki Activity

fix #595

Browse Source 
感谢 @eslizn 找到的问题，我用了更优雅的方式解决
This commit is contained in:
joyqi 2017-08-04 13:22:17 +08:00
parent 9bcfc8141a
commit 24cc1f5a5e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
var/CLI.php
View File

@ -33,10 +33,8 @@ class CLI
$this->_definition = array(
'h' => array(_t('帮助信息')),
'v' => array(_t('获取版本信息')),
'e' => array(_t('导出数据')),
'i' => array(_t('导入数据')),
'with-theme' => array(_t('导出时包含现有主题')),
'with-plugins' => array(_t('导出时包含插件及配置'))
'x' => array(_t('导出数据')),
'i' => array(_t('导入数据'))
);
$this->parseArgs();
@ -114,4 +112,4 @@ class CLI
}
}
}
}
}

6
var/Widget/Themes/Files.php
View File

@ -53,7 +53,11 @@ class Widget_Themes_Files extends Typecho_Widget
if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $this->_currentTheme)
&& is_dir($dir = $this->widget('Widget_Options')->themeFile($this->_currentTheme))
&& (!defined('__TYPECHO_THEME_WRITEABLE__') || __TYPECHO_THEME_WRITEABLE__)) {
$files = glob($dir . '/*.{php,PHP,js,JS,css,CSS,vbs,VBS}', GLOB_BRACE);
$files = array_filter(glob($dir . '/*'), function ($path) {
return preg_match("/\.(php|js|css|vbs)$/i", $path);
});
$this->_currentFile = $this->request->get('file', 'index.php');
if (preg_match("/^([_0-9a-z-\.\ ])+$/i", $this->_currentFile)

5
var/Widget/Themes/List.php
View File

@ -68,7 +68,10 @@ class Widget_Themes_List extends Typecho_Widget
$activated = $key;
}
$screen = glob($theme . '/screen*.{jpg,png,gif,bmp,jpeg,JPG,PNG,GIF,BMG,JPEG}', GLOB_BRACE);
$screen = array_filter(glob($theme . '/*'), function ($path) {
return preg_match("/\.(jpg|png|gif|bmp|jpeg)$/i", $path);
});
if ($screen) {
$info['screen'] = $options->themeUrl(basename(current($screen)), $info['name']);
} else {