Changeset 7354

Timestamp:

May 23, 2008, 8:05:38 PM (14 years ago)

Author:

ebihara

Message:

#2432:アクセスブロックを考慮する際には全体の最新日記取得に準拠するよう修正

File:

• OpenPNE/trunk/webapp/lib/db/diary.php (modified) (2 diffs)

OpenPNE/trunk/webapp/lib/db/diary.php

@@ -546 +546 @@
          . ' FROM c_diary_comment_log AS cdcl INNER JOIN c_diary AS cd USING (c_diary_id) '
          . ' WHERE cdcl.c_member_id = ?'
-         . ' AND cd.public_flag <> \'private\'';
-
-    $blocked = db_member_access_block_list4c_member_id_to($c_member_id);
-    $blocked_ids = implode(',', array_map('intval', $blocked));
-    if ($blocked_ids) {
-        $sql .= ' AND cd.c_member_id NOT IN (' . $blocked_ids . ')';
-    }
-
-    $friends = db_friend_c_member_id_list($c_member_id);
+         . ' AND cd.public_flag = \'public\'';
+
+    $friends = db_friend_c_member_id_list($c_member_id, true);
     $friend_ids = implode(',', array_map('intval', $friends));
     if ($friend_ids) {
-         $sql .= ' AND (cd.public_flag = \'public\''
-               . ' OR (cd.public_flag = \'friend\' AND cd.c_member_id IN (' . $friend_ids . ')))';
+         $sql .= ' OR (cd.public_flag = \'friend\' AND cd.c_member_id IN (' . $friend_ids . '))';
     }
 
@@ -578 +571 @@
     $select = 'SELECT cdcl.c_diary_id, cdcl.r_datetime AS maxdate, cd.*';
     $from = ' FROM c_diary_comment_log AS cdcl INNER JOIN c_diary AS cd USING (c_diary_id) ';
-    $where = ' WHERE cdcl.c_member_id = ? AND cd.public_flag <> \'private\'';
-
-
-    $blocked = db_member_access_block_list4c_member_id_to($c_member_id);
-    $blocked_ids = implode(',', array_map('intval', $blocked));
-    if ($blocked_ids) {
-        $where .= ' AND cd.c_member_id NOT IN (' . $blocked_ids . ')';
-    }
-
-    $friends = db_friend_c_member_id_list($c_member_id);
+    $where = ' WHERE cdcl.c_member_id = ? AND cd.public_flag = \'public\'';
+
+
+    $friends = db_friend_c_member_id_list($c_member_id, true);
     $friend_ids = implode(',', array_map('intval', $friends));
     if ($friend_ids) {
-         $where .= ' AND (cd.public_flag = \'public\''
-               . ' OR (cd.public_flag = \'friend\' AND cd.c_member_id IN (' . $friend_ids . ')))';
+         $where .= ' OR (cd.public_flag = \'friend\' AND cd.c_member_id IN (' . $friend_ids . '))';
     }