Changeset 3036

Timestamp:

May 19, 2007, 12:06:37 PM (12 years ago)

Author:

ogawa

Message:

#793:BIZ：繰り返し以外のすべての予定が意図せず削除されてしまう

File:

• OpenPNE/branches/stable-2.6.7/webapp_biz/modules/biz/lib/mysql_functions.php (modified) (2 diffs)

OpenPNE/branches/stable-2.6.7/webapp_biz/modules/biz/lib/mysql_functions.php

@@ -90 +90 @@
     $first_id = db_get_one($sql, $params);
 
-    $sql = 'SELECT biz_schedule_id FROM biz_schedule WHERE rep_first = ? ORDER BY begin_date';
-    $params = array(
-        intval($first_id),
-    );
-    $schedule = db_get_col($sql, $params);
+    if (!$first_id) {  // 削除しようとした繰り返し予定が存在しない
+        return array();
+    } else {
+        $sql = 'SELECT biz_schedule_id FROM biz_schedule WHERE rep_first = ? ORDER BY begin_date';
+        $params = array(
+            intval($first_id),
+        );
+        $schedule = db_get_col($sql, $params);
+    }
 
     return $schedule;
@@ -888 +892 @@
 
 //スケジュール削除
-function biz_deleteSchedule($id, $group = false)
-{
-    if ($group) {
-        $sql = 'SELECT first_id FROM biz_schedule WHERE biz_schedule_id = ?';
-        $params = array(intval($id));
-        $firstid = db_get_one($sql, $params);
-
-        $sql = 'SELECT biz_schedule_id FROM biz_schedule WHERE first_id = ?';
-        $params = array(intval($firstid));
-        $schedules = db_get_col($sql, $params);
-
-        $sql = 'DELETE FROM biz_schedule WHERE first_id = ?';
-        $params = array(intval($firstid));
-        db_query($sql, $params);
-
-        foreach ($schedules as $nowid) {
-            $sql = 'DELETE FROM biz_schedule_member WHERE biz_schedule_id = ?';
-            $params = array(intval($nowid));
-            db_query($sql, $params);
-        }
-    } else {
-        $sql = 'DELETE FROM biz_schedule WHERE biz_schedule_id = ?';
-        $params = array(
-            intval($id),
-        );
-        db_query($sql, $params);
-        $sql = 'DELETE FROM biz_schedule_member WHERE biz_schedule_id = ?';
-        $params = array(
-            intval($id),
-        );
-        db_query($sql, $params);
-    }
+function biz_deleteSchedule($id)
+{
+    $sql = 'DELETE FROM biz_schedule WHERE biz_schedule_id = ?';
+    $params = array(
+        intval($id),
+    );
+    db_query($sql, $params);
+    $sql = 'DELETE FROM biz_schedule_member WHERE biz_schedule_id = ?';
+    $params = array(
+        intval($id),
+    );
+    db_query($sql, $params);
 }