diff options
| author | callumacrae <callum@lynxphp.com> | 2013-07-12 21:52:10 -0400 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2013-11-19 07:32:49 -0800 |
| commit | 0faafce4ce254ff282de801901372f67ca4f4415 (patch) | |
| tree | e67a2f8b89a6057d88c03e0df045ee558de9c44e /phpBB/viewtopic.php | |
| parent | 46994e8dfbb3a50aeeb5b02cf850f8a7630b9e95 (diff) | |
| download | forums-0faafce4ce254ff282de801901372f67ca4f4415.tar forums-0faafce4ce254ff282de801901372f67ca4f4415.tar.gz forums-0faafce4ce254ff282de801901372f67ca4f4415.tar.bz2 forums-0faafce4ce254ff282de801901372f67ca4f4415.tar.xz forums-0faafce4ce254ff282de801901372f67ca4f4415.zip | |
[ticket/11672] Removed unnecessary text from alerts.
Messages like "Return to forum last visited" are entirely unnecessary
when using AJAX to delete a post, so this commit removes them.
PHPBB3-11672
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 3a7e633c99..ffb938a622 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -497,11 +497,20 @@ if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('b AND topic_id = $topic_id"; $db->sql_query($sql); } - $message = (($topic_data['bookmarked']) ? $user->lang['BOOKMARK_REMOVED'] : $user->lang['BOOKMARK_ADDED']) . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); + $message = (($topic_data['bookmarked']) ? $user->lang['BOOKMARK_REMOVED'] : $user->lang['BOOKMARK_ADDED']); + + if (!$request->is_ajax()) + { + $message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); + } } else { - $message = $user->lang['BOOKMARK_ERR'] . '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); + $message = $user->lang['BOOKMARK_ERR']; + if (!$request->is_ajax()) + { + $message .= '<br /><br />' . sprintf($user->lang['RETURN_TOPIC'], '<a href="' . $viewtopic_url . '">', '</a>'); + } } meta_refresh(3, $viewtopic_url); |