mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-20 01:49:40 +01:00
Code Issues Projects Releases Wiki Activity

简化链接判断

Browse Source
This commit is contained in:
joyqi 2013-12-10 16:01:22 +08:00
parent 19a9ebb8a0
commit 0adee465cc
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
var/Widget/Archive.php
View File

@ -272,7 +272,6 @@ class Widget_Archive extends Widget_Abstract_Contents
if ('/comments/' == $feedQuery || '/comments' == $feedQuery) {
/** 专为feed使用的hack */
$this->parameter->type = 'comments';
$this->parameter->checkPermalink = false;
} else {
$matched = Typecho_Router::match($this->request->feed, 'pageSize=10&isFeed=1');
if ($matched && $matched instanceof Widget_Archive) {
@ -600,12 +599,8 @@ class Widget_Archive extends Widget_Abstract_Contents
{
$type = $this->parameter->type;
if ('index' == $type // 首页跳转不用处理
if (in_array($type, array('index', 'comment_page', 404))
|| $this->_makeSinglePageAsFrontPage // 自定义首页不处理
|| $this->_invokeByFeed // 不要处理feed
|| 'feed' == $this->parameter->type // 不处理feed
|| 'comment_page' == $this->parameter->type // 不处理comment
|| $this->_invokeFromOutside // 不要处理外部调用
|| !$this->parameter->checkPermalink) { // 强制关闭
return;
}
@ -720,7 +715,7 @@ class Widget_Archive extends Widget_Abstract_Contents
{
if ('comment_page' == $this->parameter->type) {
$params = array();
$matched = Typecho_Router::match($this->request->permalink, 'checkPermalink=0');
$matched = Typecho_Router::match($this->request->permalink);
if ($matched && $matched instanceof Widget_Archive && $matched->is('single')) {
$this->import($matched);
@ -1320,9 +1315,6 @@ class Widget_Archive extends Widget_Abstract_Contents
}
}
/** 处理静态链接跳转 */
$this->checkPermalink();
/** 如果已经提前压入则直接返回 */
if ($hasPushed) {
return;
@ -1795,6 +1787,9 @@ var TypechoComment = {
*/
public function render()
{
/** 处理静态链接跳转 */
$this->checkPermalink();
/** 添加Pingback */
$this->response->setHeader('X-Pingback', $this->options->xmlRpcUrl);
$validated = false;

4
var/Widget/Feedback.php
View File

@ -262,9 +262,7 @@ class Widget_Feedback extends Widget_Abstract_Comments implements Widget_Interfa
{
/** 回调方法 */
$callback = $this->request->type;
$this->_content = Typecho_Router::match($this->request->permalink, array(
'checkPermalink' => false
));
$this->_content = Typecho_Router::match($this->request->permalink);
/** 判断内容是否存在 */
if (false !== $this->_content && $this->_content instanceof Widget_Archive &&