diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-12-30 12:20:22 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-12-30 12:20:22 -0800 |
| commit | 821f737560330827ded1fd5eabead6ac23087e24 (patch) | |
| tree | 9c5247e2a0e93d15ef5fcf2a95b36cc6441897df /phpBB/phpbb | |
| parent | b186d31ce6b0502898e93cfa5e69e2d0da0758d0 (diff) | |
| parent | d76ec60ee15c1fafbb4212eda77b842e793108d0 (diff) | |
| download | forums-821f737560330827ded1fd5eabead6ac23087e24.tar forums-821f737560330827ded1fd5eabead6ac23087e24.tar.gz forums-821f737560330827ded1fd5eabead6ac23087e24.tar.bz2 forums-821f737560330827ded1fd5eabead6ac23087e24.tar.xz forums-821f737560330827ded1fd5eabead6ac23087e24.zip | |
Merge pull request #1890 from prototech/ticket/12034
[ticket/12034] AJAXify notifications popup.
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/notification/type/base.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 951585853f..10c876b286 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -282,15 +282,17 @@ abstract class base implements \phpbb\notification\type\type_interface */ public function prepare_for_display() { + $mark_hash = generate_link_hash('mark_notification_read'); + if ($this->get_url()) { - $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id); + $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&hash=' . $mark_hash); } else { $redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : ''); - $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&redirect=' . urlencode($redirect)); + $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&hash=' . $mark_hash . '&redirect=' . urlencode($redirect)); } return array( |