From ac74c6e0cb3d691f7b3b996b63c3b14da514a5a2 Mon Sep 17 00:00:00 2001
From: joyqi <joyqi@segmentfault.com>
Date: Fri, 11 Jun 2021 14:05:35 +0800
Subject: [PATCH] fix #1104

---
 var/Widget/Contents/Page/Edit.php | 2 +-
 var/Widget/Contents/Post/Edit.php | 2 +-
 var/Widget/User.php               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/var/Widget/Contents/Page/Edit.php b/var/Widget/Contents/Page/Edit.php
index 79e86333..730ee71b 100644
--- a/var/Widget/Contents/Page/Edit.php
+++ b/var/Widget/Contents/Page/Edit.php
@@ -179,7 +179,7 @@ class Widget_Contents_Page_Edit extends Widget_Contents_Post_Edit implements Wid
 
         /** 设置提示信息 */
         $this->widget('Widget_Notice')->set($markCount > 0 ? _t('页面已经被标记为<strong>%s</strong>', $statusList[$status]) : _t('没有页面被标记'),
-        $deleteCount > 0 ? 'success' : 'notice');
+        $markCount > 0 ? 'success' : 'notice');
 
         /** 返回原网页 */
         $this->response->goBack();
diff --git a/var/Widget/Contents/Post/Edit.php b/var/Widget/Contents/Post/Edit.php
index 3577de9f..51e1d026 100644
--- a/var/Widget/Contents/Post/Edit.php
+++ b/var/Widget/Contents/Post/Edit.php
@@ -874,7 +874,7 @@ class Widget_Contents_Post_Edit extends Widget_Abstract_Contents implements Widg
 
         /** 设置提示信息 */
         $this->widget('Widget_Notice')->set($markCount > 0 ? _t('文章已经被标记为<strong>%s</strong>', $statusList[$status]) : _t('没有文章被标记'),
-        $deleteCount > 0 ? 'success' : 'notice');
+        $markCount > 0 ? 'success' : 'notice');
 
         /** 返回原网页 */
         $this->response->goBack();
diff --git a/var/Widget/User.php b/var/Widget/User.php
index 312e2dd6..ee78a746 100644
--- a/var/Widget/User.php
+++ b/var/Widget/User.php
@@ -263,9 +263,9 @@ class Widget_User extends Typecho_Widget
                 return false;
             } else {
                 //防止循环重定向
-                $this->response->redirect($this->options->loginUrl .
+                $this->response->redirect(defined('__TYPECHO_ADMIN__') ? $this->options->loginUrl .
                 (0 === strpos($this->request->getReferer(), $this->options->loginUrl) ? '' :
-                '?referer=' . urlencode($this->request->makeUriByRequest())), false);
+                '?referer=' . urlencode($this->request->makeUriByRequest())) : $this->options->siteUrl, false);
             }
         }