mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

[ticket/11103] Mark read link if notification has no URL to view it

Browse Source 
Other style stuff

PHPBB3-11103
This commit is contained in:
Nathaniel Guse
2012-10-16 10:51:07 -05:00
parent a2d6e40f1b
commit c8b66a26ef
7 changed files with 53 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/notification/type/base.php
View File

@@ -126,6 +126,17 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
*/
public function prepare_for_display()
{
if ($this->get_url())
{
$u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id);
}
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));
}
return array(
'NOTIFICATION_ID' => $this->notification_id,
@@ -138,7 +149,7 @@ abstract class phpbb_notification_type_base implements phpbb_notification_type_i
'UNREAD' => $this->unread,
'U_MARK_READ' => append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id),
'U_MARK_READ' => ($this->unread) ? $u_mark_read : '',
);
}