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 /phpBB/viewforum.php | |
| 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
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 8 |
1 files changed, 3 insertions, 5 deletions
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? |