summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-08-29 22:33:14 +0800
committervictor <victor@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-08-29 22:33:14 +0800
commita11d747015c5698ced27e99c77bab5dd272b5c32 (patch)
tree35d24ec116a079ffc07aabd39c9df23c6166c3c8
parent9a7ef6a1c617309f778a335f48c0100b1907bc45 (diff)
downloadpttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar.gz
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar.bz2
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar.lz
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar.xz
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.tar.zst
pttbbs-a11d747015c5698ced27e99c77bab5dd272b5c32.zip
fix the wrong condition
use fav root to store those adm tags git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3115 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/board.c4
-rw-r--r--mbbsd/fav.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/mbbsd/board.c b/mbbsd/board.c
index f9331bc2..46a52e74 100644
--- a/mbbsd/board.c
+++ b/mbbsd/board.c
@@ -646,7 +646,7 @@ paste_taged_brds(int gid)
if (gid == 0 || ! (HasUserPerm(PERM_SYSOP) || GROUPOP()) ||
getans("貼上標記的看板?(y/N)")!='y') return 0;
- fav = get_current_fav();
+ fav = get_fav_root();
for (tmp = 0; tmp < fav->DataTail; tmp++) {
boardheader_t *bh;
bid = fav_getid(&fav->favh[tmp]);
@@ -675,7 +675,7 @@ choose_board(int newflag)
char keyword[13] = "", buf[64];
setutmpmode(newflag ? READNEW : READBRD);
- if( get_current_fav() == NULL )
+ if( get_fav_root() == NULL )
fav_load();
++choose_board_depth;
brdnum = 0;
diff --git a/mbbsd/fav.c b/mbbsd/fav.c
index 90ce7dc5..7989b9ba 100644
--- a/mbbsd/fav.c
+++ b/mbbsd/fav.c
@@ -804,9 +804,9 @@ static void move_in_folder(fav_t *fav, int src, int dst)
if (fav == NULL)
return;
count = get_data_number(fav);
- if (src < fav->DataTail)
+ if (src >= fav->DataTail)
src = count;
- if (dst < fav->DataTail)
+ if (dst >= fav->DataTail)
dst = count;
if (src == dst)
return;