Changeset 6000
- Timestamp:
- Mar 24, 2008, 12:49:50 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
OpenPNE/branches/stable-2.8.x/webapp/lib/db/diary.php
r3057 r6000 564 564 565 565 $friends = db_friend_c_member_id_list($c_member_id); 566 $firends[] = 0;567 566 $friend_ids = implode(',', $friends); 568 567 … … 579 578 ' AND mydc.c_member_id <> d.c_member_id' . 580 579 ' AND d.c_member_id NOT IN (' . $except_ids . ')' . 581 ' AND (d.public_flag = \'public\' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . ')))' . 580 ' AND (d.public_flag = \'public\''; 581 if ($friend_ids) { 582 $sql .= ' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . '))'; 583 } 584 $sql .= ')' . 582 585 ' GROUP BY dc.c_diary_id' . 583 586 ' ORDER BY r_datetime DESC'; … … 598 601 ' AND mydc.c_member_id <> d.c_member_id' . 599 602 ' AND d.c_member_id NOT IN (' . $except_ids . ')' . 600 ' AND (d.public_flag = \'public\' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . ')))'; 603 ' AND (d.public_flag = \'public\''; 604 if ($friend_ids) { 605 $sql .= ' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . '))'; 606 } 607 $sql .= ')'; 608 601 609 $total_num = db_get_one($sql, $params); 602 610
Note: See TracChangeset
for help on using the changeset viewer.