aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_display.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-14 15:46:45 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-14 15:46:45 +0100
commit16c021e98667fe353e6b3a6cb0bbf3b8f2319f98 (patch)
tree1eefa62ead19c51f861e9a1fcbc41e4bca7cb813 /phpBB/includes/functions_display.php
parent5919407a1d183412ce02f6ceee62435f6effd499 (diff)
downloadforums-16c021e98667fe353e6b3a6cb0bbf3b8f2319f98.tar
forums-16c021e98667fe353e6b3a6cb0bbf3b8f2319f98.tar.gz
forums-16c021e98667fe353e6b3a6cb0bbf3b8f2319f98.tar.bz2
forums-16c021e98667fe353e6b3a6cb0bbf3b8f2319f98.tar.xz
forums-16c021e98667fe353e6b3a6cb0bbf3b8f2319f98.zip
[ticket/10954] Change behavior of marking topics/forums
It will now display a popup message for 3 seconds which will confirm the taken action. The amount of DOM traversals have been significantly reduced and jQuery.each is now used instead of for loops. Additionally, it is now possible to click on the mark topics/forums read links without triggering an AJAX error. PHPBB3-10954
Diffstat (limited to 'phpBB/includes/functions_display.php')
-rw-r--r--phpBB/includes/functions_display.php14
1 files changed, 10 insertions, 4 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index f3198bc1e5..cd4c901b58 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -63,10 +63,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if ($request->is_ajax())
{
- // Tell the ajax script what language vars need to be replaced
+ // Tell the ajax script what language vars and URL need to be replaced
$data = array(
'NO_UNREAD_POSTS' => $user->lang['NO_UNREAD_POSTS'],
- 'UNREAD_POSTS' => $user->lang['UNREAD_POSTS']
+ 'UNREAD_POSTS' => $user->lang['UNREAD_POSTS'],
+ 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '',
+ 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
+ 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED']
);
$json_response = new phpbb_json_response();
$json_response->send($data);
@@ -326,10 +329,13 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
if ($request->is_ajax())
{
- // Tell the ajax script what language vars need to be replaced
+ // Tell the ajax script what language vars and URL need to be replaced
$data = array(
'NO_UNREAD_POSTS' => $user->lang['NO_UNREAD_POSTS'],
- 'UNREAD_POSTS' => $user->lang['UNREAD_POSTS']
+ 'UNREAD_POSTS' => $user->lang['UNREAD_POSTS'],
+ 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'hash=' . generate_link_hash('global') . '&f=' . $root_data['forum_id'] . '&mark=forums&mark_time=' . time()) : '',
+ 'MESSAGE_TITLE' => $user->lang['INFORMATION'],
+ 'MESSAGE_TEXT' => $user->lang['FORUMS_MARKED']
);
$json_response = new phpbb_json_response();
$json_response->send($data);