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

[ticket/10954] Modify is_ajax check for consistency

Browse Source 
PHPBB3-10954
This commit is contained in:
Marc Alexander
2012-12-12 19:09:18 +01:00
parent a57c81481d
commit 7efc37d1f9
2 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/includes/functions_display.php
View File

@@ -61,14 +61,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
{
markread('all', false, false, request_var('mark_time', 0));
if (!$request->is_ajax())
{
trigger_error(
$user->lang['FORUMS_MARKED'] . '<br /><br />' .
sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
);
}
else
if ($request->is_ajax())
{
// Tell the ajax script what language vars need to be replaced
$data = array(
@@ -78,6 +71,11 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$json_response = new phpbb_json_response();
$json_response->send($data);
}
trigger_error(
$user->lang['FORUMS_MARKED'] . '<br /><br />' .
sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect . '">', '</a>')
);
}
else
{
@@ -326,11 +324,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$message = sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect . '">', '</a>');
meta_refresh(3, $redirect);
if (!$request->is_ajax())
{
trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
}
else
if ($request->is_ajax())
{
// Tell the ajax script what language vars need to be replaced
$data = array(
@@ -340,6 +334,8 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
$json_response = new phpbb_json_response();
$json_response->send($data);
}
trigger_error($user->lang['FORUMS_MARKED'] . '<br /><br />' . $message);
}
else
{