Changeset 2911

Timestamp:

May 15, 2007, 11:13:50 PM (12 years ago)

Author:

ogawa

Message:

#757:日記修正確認画面から「キャンセル」で日記編集画面に戻った場合、公開範囲設定が保持されていない

Location:

OpenPNE/branches/2.8.x/webapp/modules/pc

Files:

• page/h_diary_edit.php (modified) (3 diffs)
• templates/h_diary_edit_confirm.tpl (modified) (1 diff)

OpenPNE/branches/2.8.x/webapp/modules/pc/page/h_diary_edit.php

@@ -20 +20 @@
 
         $c_diary = db_diary_get_c_diary4id($target_c_diary_id);
-        if (!(is_null($subject) || is_null($body))) {
-            $c_diary['subject'] = $subject;
-            $c_diary['body'] = $body;
-        }
 
         // target が指定されていない
@@ -53 +49 @@
         //プロフィール
         $this->set("target_member", db_member_c_member4c_member_id($u));
-        $this->set("diary", $c_diary);
 
         //カレンダー関係
@@ -96 +91 @@
         }
 
+        if (!(is_null($subject) || is_null($body))) {
+            $c_diary['subject'] = $subject;
+            $c_diary['body'] = $body;
+        }
+        if ($public_flag) {
+            $c_diary['public_flag'] = util_cast_public_flag_diary($public_flag);
+        }
+        $this->set("diary", $c_diary);
+
         // inc_entry_point
         $this->set('inc_entry_point', fetch_inc_entry_point($this->getView(), 'h_diary_edit'));

OpenPNE/branches/2.8.x/webapp/modules/pc/templates/h_diary_edit_confirm.tpl

@@ -247 +247 @@
 <input type="hidden" name="subject" value="({$form_val.subject})">
 <input type="hidden" name="body" value="({$form_val.body})">
+<input type="hidden" name="public_flag" value="({$form_val.public_flag})">
 <input type="hidden" name="category" value="({$form_val.category})">
 <td><input type="submit" class="submit" value="　修 　正　"></td>