diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-05 10:44:48 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-05 10:44:48 -0400 |
| commit | d9fd0cce0a5b323bff785af401e90370a3d73972 (patch) | |
| tree | fad7e45e42186efaef6365dcb83c6dca87d8ae57 /phpBB/includes/functions_display.php | |
| parent | c54d74ec0ed24a9ee7c0d722eb185f1c8a58aab9 (diff) | |
| parent | f1056a9b2fd6e4ff7bc107372e9210bae9e077f0 (diff) | |
| download | forums-d9fd0cce0a5b323bff785af401e90370a3d73972.tar forums-d9fd0cce0a5b323bff785af401e90370a3d73972.tar.gz forums-d9fd0cce0a5b323bff785af401e90370a3d73972.tar.bz2 forums-d9fd0cce0a5b323bff785af401e90370a3d73972.tar.xz forums-d9fd0cce0a5b323bff785af401e90370a3d73972.zip | |
Merge PR #759 branch 'nickvergessen/ticket/10811' into develop
* nickvergessen/ticket/10811:
[ticket/10811] Make toogle_subscribe more generic so it can toogle all links
[ticket/10811] Make it easier for MODs/Extensions to define the alt-text
[ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
[ticket/10811] Fix AJAX callback alt_text so it can be repeated.
Diffstat (limited to 'phpBB/includes/functions_display.php')
| -rw-r--r-- | phpBB/includes/functions_display.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 1f45d5e8e1..545f75ad67 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1221,7 +1221,9 @@ function watch_topic_forum($mode, &$s_watching, $user_id, $forum_id, $topic_id, if ($can_watch) { $s_watching['link'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . (($is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start&hash=" . generate_link_hash("{$mode}_$match_id")); + $s_watching['link_toggle'] = append_sid("{$phpbb_root_path}view$mode.$phpEx", "$u_url=$match_id&" . ((!$is_watching) ? 'unwatch' : 'watch') . "=$mode&start=$start&hash=" . generate_link_hash("{$mode}_$match_id")); $s_watching['title'] = $user->lang[(($is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; + $s_watching['title_toggle'] = $user->lang[((!$is_watching) ? 'STOP' : 'START') . '_WATCHING_' . strtoupper($mode)]; $s_watching['is_watching'] = $is_watching; } |