v1.3.0 (#1661)
* Add feed widget * add feed render * Add CommentPage widget * New theme (#1390) * 调整忽略目录 * add theme * fix theme scss build Co-authored-by: fen <f3nb0x@gmail.com> * s/is_writeable/is_writable/g * New upgrade method * merge new fixes from master * add pgsql ssl mode support (ref #1600) (#1623) * Feat/code refactor (#1626) * remove all magic methods, add type for class properties * refactor codes * fix all * refactor code * fix type * fix all * fix request is method * fix all * fix router * fix get page * fix 1.3.0 upgrade * [feat] support high resolution avatar * fix types in i18n component * Implement Ctrl+S or Command+S for save draft (#1628) * Implement Ctrl+S or Command+S for save draft * rename * add Typecho.savePost * fix upload file size * add new uploader * replace new uploader * fix textarea change * fix preview * refactor post edit * fix issue * fix page edit --------- Co-authored-by: joyqi <joyqi@segmentfault.com> Co-authored-by: joyqi <magike.net@gmail.com> * fix #1632 * Add svg to image types * Feat/tree pages (#1646) * add tree trait * finish category tree trait * support select fields * fix select fields * refactor admin trait * fix draft status * Add new contents type "revision" * minor refactor * add more tree view abstracts * add tree trait to pages * get ready for tree view pages * improve page edit * fix revision * fix slug * add router params delegate * fix params delegate * fix * fix * fix all * fix all * fix tree * fix page link * fix feed * fix page * fix permalink * fix permalink input * fix offset query * Support IDN (#1629) * Support IDN * use js * Optimize code * Optimize code * fix URL script * remove unnecessary use --------- Co-authored-by: joyqi <joyqi@segmentfault.com> * fix input element * fix #1651, close #1653 * Use json instead of serialize (#1624) * Use json instead of serialize * Fix Upgrade code * add tree trait * finish category tree trait * support select fields * fix select fields * refactor admin trait * fix draft status * Add new contents type "revision" * minor refactor * add more tree view abstracts * add tree trait to pages * get ready for tree view pages * improve page edit * fix revision * fix slug * add router params delegate * fix params delegate * fix * fix * fix all * fix all * fix tree * fix page link * fix feed * fix page * fix permalink * fix permalink input * fix offset query * Fix typo * remove proxy methods * remove unnecessary useage --------- Co-authored-by: joyqi <joyqi@segmentfault.com> Co-authored-by: joyqi <magike.net@gmail.com> * Fix Prevent XSS vulnerability in default theme (#1654) * Fix Prevent XSS vulnerability in default theme * Update var/Typecho/Db/Adapter/Pdo.php * fix the getter --------- Co-authored-by: joyqi <joyqi@segmentfault.com> * add throwCallback to widget response * fix: cut down fields when selecting recent posts * fix typo errors * fix typo errors * fix http client cookie * add throw finish * fix theme lang * fix default theme * fix query * add open graph and twitter card support add canonical link * fix canonical link meta * fix theme classic-22 * remove unnecessary scss file when packaging * init plugin signal * improve: remove feather-icon js file * fix: typo * improve: post detail layout * fix tags saving * improve: nav search * fix: theme screenshot * fix: theme page layout * remove php 7.2/7.3 env --------- Co-authored-by: fen <f3nb0x@gmail.com> Co-authored-by: Lu Fei <52o@qq52o.cn>
This commit is contained in:
joyqi
+11
-8
@@ -10,6 +10,7 @@ use Widget\Contents\Attachment\Edit as AttachmentEdit;
|
||||
use Widget\Contents\Post\Edit as PostEdit;
|
||||
use Widget\Contents\Page\Edit as PageEdit;
|
||||
use Widget\Contents\Post\Admin as PostAdmin;
|
||||
use Widget\Contents\Page\Admin as PageAdmin;
|
||||
use Widget\Comments\Admin as CommentsAdmin;
|
||||
use Widget\Metas\Category\Admin as CategoryAdmin;
|
||||
use Widget\Metas\Category\Edit as CategoryEdit;
|
||||
@@ -30,41 +31,41 @@ class Menu extends Base
|
||||
* 当前菜单标题
|
||||
* @var string
|
||||
*/
|
||||
public $title;
|
||||
public string $title;
|
||||
|
||||
/**
|
||||
* 当前增加项目链接
|
||||
* @var string
|
||||
* @var string|null
|
||||
*/
|
||||
public $addLink;
|
||||
public ?string $addLink;
|
||||
|
||||
/**
|
||||
* 父菜单列表
|
||||
*
|
||||
* @var array
|
||||
*/
|
||||
private $menu = [];
|
||||
private array $menu = [];
|
||||
|
||||
/**
|
||||
* 当前父菜单
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
private $currentParent = 1;
|
||||
private int $currentParent = 1;
|
||||
|
||||
/**
|
||||
* 当前子菜单
|
||||
*
|
||||
* @var integer
|
||||
*/
|
||||
private $currentChild = 0;
|
||||
private int $currentChild = 0;
|
||||
|
||||
/**
|
||||
* 当前页面
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
private $currentUrl;
|
||||
private string $currentUrl;
|
||||
|
||||
/**
|
||||
* 执行函数,初始化菜单
|
||||
@@ -95,11 +96,13 @@ class Menu extends Base
|
||||
[[PostEdit::class, 'getMenuTitle'], [PostEdit::class, 'getMenuTitle'], 'write-post.php?cid=', 'contributor', true],
|
||||
[_t('创建页面'), _t('创建新页面'), 'write-page.php', 'editor'],
|
||||
[[PageEdit::class, 'getMenuTitle'], [PageEdit::class, 'getMenuTitle'], 'write-page.php?cid=', 'editor', true],
|
||||
[[PageEdit::class, 'getMenuTitle'], [PageEdit::class, 'getMenuTitle'], 'write-page.php?parent=', 'editor', true],
|
||||
],
|
||||
[
|
||||
[_t('文章'), _t('管理文章'), 'manage-posts.php', 'contributor', false, 'write-post.php'],
|
||||
[[PostAdmin::class, 'getMenuTitle'], [PostAdmin::class, 'getMenuTitle'], 'manage-posts.php?uid=', 'contributor', true],
|
||||
[_t('独立页面'), _t('管理独立页面'), 'manage-pages.php', 'editor', false, 'write-page.php'],
|
||||
[[PageAdmin::class, 'getMenuTitle'], [PageAdmin::class, 'getMenuTitle'], 'manage-pages.php?parent=', 'editor', true, [PageAdmin::class, 'getAddLink']],
|
||||
[_t('评论'), _t('管理评论'), 'manage-comments.php', 'contributor'],
|
||||
[[CommentsAdmin::class, 'getMenuTitle'], [CommentsAdmin::class, 'getMenuTitle'], 'manage-comments.php?cid=', 'contributor', true],
|
||||
[_t('分类'), _t('管理分类'), 'manage-categories.php', 'editor', false, 'category.php'],
|
||||
@@ -124,7 +127,7 @@ class Menu extends Base
|
||||
];
|
||||
|
||||
/** 获取扩展菜单 */
|
||||
$panelTable = unserialize($this->options->panelTable);
|
||||
$panelTable = $this->options->panelTable;
|
||||
$extendingParentMenu = empty($panelTable['parent']) ? [] : $panelTable['parent'];
|
||||
$extendingChildMenu = empty($panelTable['child']) ? [] : $panelTable['child'];
|
||||
$currentUrl = $this->request->getRequestUrl();
|
||||
|
||||
Reference in New Issue
Block a user