diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-03 21:10:25 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-03 21:10:25 +0100 |
| commit | 8b2d515736ffc9e9497e35f0db2e8357f91805d5 (patch) | |
| tree | 68c24e1227fb34d82d328ceee070eb1aec150f90 /phpBB/viewtopic.php | |
| parent | 8f504b1ca59b4dd3fc721e2833c070f9a624221d (diff) | |
| parent | 6d45146df7e7b19d6286f09370950fda207e309e (diff) | |
| download | forums-8b2d515736ffc9e9497e35f0db2e8357f91805d5.tar forums-8b2d515736ffc9e9497e35f0db2e8357f91805d5.tar.gz forums-8b2d515736ffc9e9497e35f0db2e8357f91805d5.tar.bz2 forums-8b2d515736ffc9e9497e35f0db2e8357f91805d5.tar.xz forums-8b2d515736ffc9e9497e35f0db2e8357f91805d5.zip | |
Merge remote-tracking branch 'prototech/ticket/11672' into develop
* prototech/ticket/11672:
[ticket/11672] Move the reapply_sid() call before meta_refresh() is called.
[ticket/11672] Remove duplicate $request global.
[ticket/11672] The json response call exits so the else is not necessary.
[ticket/11672] Remove the messages for lock/unlock/change topic type.
[ticket/11672] Clean up the logic in mcp_queue.php.
[ticket/11672] Remove some messages that were missed in mcp_queue.php.
[ticket/11672] Replace sprintf() usage with $user->lang().
[ticket/11672] Removed unnecessary text from alerts.
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a182268a71..3735bca83d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -484,11 +484,21 @@ 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 />' . $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 />' . $user->lang('RETURN_TOPIC', '<a href="' . $viewtopic_url . '">', '</a>'); + } } meta_refresh(3, $viewtopic_url); |