From 70988814c50e4e0d4f3ae651a911de4a8f204e54 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Mon, 20 Nov 2023 18:41:21 +0700 Subject: [PATCH] Removed topic watch useless code (#1137) * Removed topic watch useless code * Update CHANGELOG.md --- CHANGELOG.md | 1 + styles/templates/default/tpl_config.php | 2 -- viewtopic.php | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a27caa1a..5d720476f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ **Merged pull requests:** +- Removed topic watch useless code [\#1137](https://github.com/torrentpier/torrentpier/pull/1137) ([belomaxorka](https://github.com/belomaxorka)) - Fixed topic_watch array key name [\#1136](https://github.com/torrentpier/torrentpier/pull/1136) ([belomaxorka](https://github.com/belomaxorka)) - Fixed announce-list indexes ordering [\#1135](https://github.com/torrentpier/torrentpier/pull/1135) ([belomaxorka](https://github.com/belomaxorka)) - Fixed $bb_cfg['file_id_ext'] ordering [\#1134](https://github.com/torrentpier/torrentpier/pull/1134) ([belomaxorka](https://github.com/belomaxorka)) diff --git a/styles/templates/default/tpl_config.php b/styles/templates/default/tpl_config.php index 267ecb60d..2df77c957 100644 --- a/styles/templates/default/tpl_config.php +++ b/styles/templates/default/tpl_config.php @@ -96,8 +96,6 @@ $images['pm_new_msg'] = ''; $images['pm_no_new_msg'] = ''; // topic_mod_icons will be replaced with SELECT later... -$images['topic_watch'] = ''; -$images['topic_un_watch'] = ''; $images['topic_mod_lock'] = $_main . 'topic_lock.gif'; $images['topic_mod_unlock'] = $_main . 'topic_unlock.gif'; $images['topic_mod_split'] = $_main . 'topic_split.gif'; diff --git a/viewtopic.php b/viewtopic.php index 9d853f568..9c28ec2c1 100644 --- a/viewtopic.php +++ b/viewtopic.php @@ -420,14 +420,12 @@ if ($is_auth['auth_mod']) { } // Topic watch information -$s_watching_topic = $s_watching_topic_img = ''; +$s_watching_topic = ''; if ($can_watch_topic) { if ($is_watching_topic) { $s_watching_topic = "' . $lang['STOP_WATCHING_TOPIC'] . ''; - $s_watching_topic_img = isset($images['topic_un_watch']) ? "' . $lang['STOP_WATCHING_TOPIC'] . '' : ''; } else { $s_watching_topic = "' . $lang['START_WATCHING_TOPIC'] . ''; - $s_watching_topic_img = isset($images['topic_watch']) ? "' . $lang['START_WATCHING_TOPIC'] . '' : ''; } } @@ -508,7 +506,6 @@ $template->assign_vars([ 'S_AUTH_LIST' => $s_auth_can, 'S_TOPIC_ADMIN' => $topic_mod, 'S_WATCH_TOPIC' => $s_watching_topic, - 'S_WATCH_TOPIC_IMG' => $s_watching_topic_img, 'U_VIEW_TOPIC' => TOPIC_URL . $topic_id, 'U_VIEW_FORUM' => $view_forum_url, 'U_VIEW_OLDER_TOPIC' => $view_prev_topic_url,