Changeset 6000

Timestamp:

Mar 24, 2008, 12:49:50 PM (13 years ago)

Author:

ogawa

Message:

#2081:一人もマイフレンドがいない状態で日記コメント記入履歴の「もっと読む」をクリックすると「記入したコメントはありません」と表示されていたのを修正

File:

• OpenPNE/branches/stable-2.8.x/webapp/lib/db/diary.php (modified) (3 diffs)

OpenPNE/branches/stable-2.8.x/webapp/lib/db/diary.php

@@ -564 +564 @@
 
     $friends = db_friend_c_member_id_list($c_member_id);
-    $firends[] = 0;
     $friend_ids = implode(',', $friends);
 
@@ -579 +578 @@
             ' AND mydc.c_member_id <> d.c_member_id' .
             ' AND d.c_member_id NOT IN (' . $except_ids . ')' .
-            ' AND (d.public_flag = \'public\' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . ')))' .
+            ' AND (d.public_flag = \'public\'';
+    if ($friend_ids) {
+        $sql .= ' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . '))';
+    }
+    $sql .= ')' .
         ' GROUP BY dc.c_diary_id' .
         ' ORDER BY r_datetime DESC';
@@ -598 +601 @@
             ' AND mydc.c_member_id <> d.c_member_id' .
             ' AND d.c_member_id NOT IN (' . $except_ids . ')' .
-            ' AND (d.public_flag = \'public\' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . ')))';
+            ' AND (d.public_flag = \'public\'';
+    if ($friend_ids) {
+        $sql .= ' OR (d.public_flag = \'friend\' AND d.c_member_id IN (' . $friend_ids . '))';
+    }
+    $sql .= ')';
+ 
     $total_num = db_get_one($sql, $params);