Changeset 5887

Timestamp:

03/20/08 00:16:09 (2 years ago)

Author:

ebihara

Message:

#2105:merged r5883:5885

Files:

• OpenPNE/branches/stable-2.8.x/webapp/lib/db/commu.php (modified) (2 diffs)
• OpenPNE/branches/stable-2.8.x/webapp/modules/pc/do/c_event_add_insert_c_commu_topic.php (modified) (1 diff)

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

@@ -2414 +2414 @@
-        'r_date' => db_now(),
-    );
+
+    $open_date = '0000-00-00';
+    $invite_period = '0000-00-00';
+
+    if (isset($topic['open_date']) && $topic['open_date']) {
+        $open_date = $topic['open_date'];
+    }
+    
+    if (isset($topic['invite_period']) && $topic['invite_period']) {
+        $invite_period = $topic['invite_period'];
+    }
+
-    if ($data['event_flag']) {
-        $data += array(
-topic['open_date']
+open_date
-            'open_date_comment' => $topic['open_date_comment'],
-            'open_pref_id'      => intval($topic['open_pref_id']),
-            'open_pref_comment' => $topic['open_pref_comment'],
-topic['invite_period']
+invite_period
-        );
-    }
@@ -2488 +2500 @@
-        'r_date'      => db_now(),
-    );
+
+
+    $open_date = '0000-00-00';
+    $invite_period = '0000-00-00';
+
+    if (isset($topic['open_date']) && $topic['open_date']) {
+        $open_date = $topic['open_date'];
+    }
+    
+    if (isset($topic['invite_period']) && $topic['invite_period']) {
+        $invite_period = $topic['invite_period'];
+    }
+
-    if ($data['event_flag']) {
-        $data += array(
-topic['open_date']
+open_date
-            'open_date_comment' => $topic['open_date_comment'],
-            'open_pref_id'      => intval($topic['open_pref_id']),
-            'open_pref_comment' => $topic['open_pref_comment'],
-topic['invite_period']
+invite_period
-        );
-    }

OpenPNE/branches/stable-2.8.x/webapp/modules/pc/do/c_event_add_insert_c_commu_topic.php

@@ -72 +72 @@
-        if ($event['invite_period_year'].$event['invite_period_month'].$event['invite_period_day']!="") {
-            $invite_period = $event['invite_period_year']."-".$event['invite_period_month']."-".$event['invite_period_day'];
-        } else {
-            $invite_period = "0000-00-00";
-        }
-