diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-12-12 19:09:18 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-12-12 19:09:18 +0100 |
| commit | 7efc37d1f9d4a4335fc91af147cd059c17b7d45e (patch) | |
| tree | 4f8490d4dc2eb01eb1585bf90aab99910adf3b39 | |
| parent | a57c81481d21433bdb185accfd7f2b82858ba461 (diff) | |
| download | forums-7efc37d1f9d4a4335fc91af147cd059c17b7d45e.tar forums-7efc37d1f9d4a4335fc91af147cd059c17b7d45e.tar.gz forums-7efc37d1f9d4a4335fc91af147cd059c17b7d45e.tar.bz2 forums-7efc37d1f9d4a4335fc91af147cd059c17b7d45e.tar.xz forums-7efc37d1f9d4a4335fc91af147cd059c17b7d45e.zip | |
[ticket/10954] Modify is_ajax check for consistency
PHPBB3-10954
| -rw-r--r-- | phpBB/includes/functions_display.php | 22 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 8 |
2 files changed, 12 insertions, 18 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 9745d493c4..f3198bc1e5 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -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 { diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1b84c5f52f..d514cf2d61 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -181,11 +181,7 @@ if ($mark_read == 'topics') $redirect_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); meta_refresh(3, $redirect_url); - if (!$request->is_ajax()) - { - trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>')); - } - else + if ($request->is_ajax()) { // Tell the ajax script what language vars need to be replaced $data = array( @@ -195,6 +191,8 @@ if ($mark_read == 'topics') $json_response = new phpbb_json_response(); $json_response->send($data); } + + trigger_error($user->lang['TOPICS_MARKED'] . '<br /><br />' . sprintf($user->lang['RETURN_FORUM'], '<a href="' . $redirect_url . '">', '</a>')); } // Is a forum specific topic count required? |