696_new.diff
lib/model/doctrine/PluginDeletedMessageTable.class.php (作業コピー) | ||
---|---|---|
131 | 131 |
* @param int $message_id |
132 | 132 |
* @return boolean |
133 | 133 |
*/ |
134 |
public function restoreMessage($message_id) |
|
134 |
public function restoreMessage($message_id, $member_id = null)
|
|
135 | 135 |
{ |
136 |
$deleted_message = $this->find($message_id); |
|
136 |
$member_id = $member_id ? $member_id : sfContext::getInstance()->getUser()->getMemberId(); |
|
137 |
$deleted_message = $this->findOneByIdAndMemberId($message_id, $member_id); |
|
137 | 138 |
if (!$deleted_message) { |
138 | 139 |
return false; |
139 | 140 |
} |
lib/action/opMessagePluginMessageActions.class.php (作業コピー) | ||
---|---|---|
177 | 177 |
} |
178 | 178 |
$this->forward404Unless( |
179 | 179 |
Doctrine::getTable('DeletedMessage')->deleteMessage( |
180 |
sfContext::getInstance()->getUser()->getMemberId(),
|
|
180 |
$this->getUser()->getMemberId(),
|
|
181 | 181 |
$request->getParameter('id'), |
182 | 182 |
$objectName |
183 | 183 |
) |
... | ... | |
195 | 195 |
{ |
196 | 196 |
$request->checkCSRFProtection(); |
197 | 197 | |
198 |
Doctrine::getTable('DeletedMessage')->restoreMessage($request->getParameter('id'));
|
|
198 |
$this->forward404Unless(Doctrine::getTable('DeletedMessage')->restoreMessage($request->getParameter('id')));
|
|
199 | 199 |
$this->redirect('@dustList'); |
200 | 200 |
} |
201 | 201 |
|