diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 8829554276..140ffc42f0 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1168,9 +1168,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
{
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_UNWATCHING'];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', '');
+ $message .= '
' . $user->lang('RETURN_' . strtoupper($mode), '', '');
}
trigger_error($message);
}
@@ -1182,9 +1183,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['NOT_WATCHING_' . strtoupper($mode)];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', '');
+ $message .= '
' . $user->lang('RETURN_' . strtoupper($mode), '', '');
}
meta_refresh(3, $redirect_url);
trigger_error($message);
@@ -1240,9 +1242,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
{
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ERR_WATCHING'];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', '');
+ $message .= '
' . $user->lang('RETURN_' . strtoupper($mode), '', '');
}
trigger_error($message);
}
@@ -1255,9 +1258,10 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id,
$redirect_url = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&start=$start");
$message = $user->lang['ARE_WATCHING_' . strtoupper($mode)];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_' . strtoupper($mode)], '', '');
+ $message .= '
' . $user->lang('RETURN_' . strtoupper($mode), '', '');
}
meta_refresh(3, $redirect_url);
trigger_error($message);
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php
index 365a794253..e529960c99 100644
--- a/phpBB/includes/mcp/mcp_queue.php
+++ b/phpBB/includes/mcp/mcp_queue.php
@@ -887,7 +887,7 @@ class mcp_queue
}
else
{
- $message .= '
' . sprintf($user->lang['RETURN_PAGE'], "", '') . $add_message;
+ $message .= '
' . $user->lang('RETURN_PAGE', '', '') . $add_message;
}
trigger_error($message);
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 6e9cc1aa94..0d2cff40bc 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -385,12 +385,12 @@ if ($mode == 'bump')
{
$meta_url = phpbb_bump_topic($forum_id, $topic_id, $post_data, $current_time);
meta_refresh(3, $meta_url);
-
$message = $user->lang['TOPIC_BUMPED'];
+
if (!$request->is_ajax())
{
$message .= '
' . $user->lang('VIEW_MESSAGE', '', '');
- $message .= '
' . sprintf($user->lang['RETURN_FORUM'], '', '');
+ $message .= '
' . $user->lang('RETURN_FORUM', '', '');
}
trigger_error($message);
@@ -1667,16 +1667,17 @@ function handle_post_delete($forum_id, $topic_id, $post_id, &$post_data, $is_sof
$meta_info = append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&t=$topic_id&p=$next_post_id") . "#p$next_post_id";
$message = $user->lang['POST_DELETED'];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_TOPIC'], '', '');
+ $message .= '
' . $user->lang('RETURN_TOPIC', '', '');
}
}
meta_refresh(3, $meta_info);
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_FORUM'], '', '');
+ $message .= '
' . $user->lang('RETURN_FORUM', '', '');
}
trigger_error($message);
}
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index ffb938a622..75e21b374b 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -501,15 +501,16 @@ if ($config['allow_bookmarks'] && $user->data['is_registered'] && request_var('b
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_TOPIC'], '', '');
+ $message .= '
' . $user->lang('RETURN_TOPIC', '', '');
}
}
else
{
$message = $user->lang['BOOKMARK_ERR'];
+
if (!$request->is_ajax())
{
- $message .= '
' . sprintf($user->lang['RETURN_TOPIC'], '', '');
+ $message .= '
' . $user->lang('RETURN_TOPIC', '', '');
}
}
meta_refresh(3, $viewtopic_url);