diff --git a/CHANGELOG.md b/CHANGELOG.md index 3519cfab1..83fc02e9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ - Show poll prefix for guests [\#1417](https://github.com/torrentpier/torrentpier/pull/1417) ([belomaxorka](https://github.com/belomaxorka)) - Used hashing for filenames generation [\#1385](https://github.com/torrentpier/torrentpier/pull/1385) ([belomaxorka](https://github.com/belomaxorka)) - Hide quote button if topic locked [\#1416](https://github.com/torrentpier/torrentpier/pull/1416) ([belomaxorka](https://github.com/belomaxorka)) -- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406), [\#1408](https://github.com/torrentpier/torrentpier/pull/1408), [\#1409](https://github.com/torrentpier/torrentpier/pull/1409), [\#1410](https://github.com/torrentpier/torrentpier/pull/1410), [\#1411](https://github.com/torrentpier/torrentpier/pull/1411), [\#1418](https://github.com/torrentpier/torrentpier/pull/1418) ([belomaxorka](https://github.com/belomaxorka)) +- Minor improvements [\#1382](https://github.com/torrentpier/torrentpier/pull/1382), [\#1383](https://github.com/torrentpier/torrentpier/pull/1383), [\#1391](https://github.com/torrentpier/torrentpier/pull/1391), [\#1398](https://github.com/torrentpier/torrentpier/pull/1398), [\#1405](https://github.com/torrentpier/torrentpier/pull/1405), [\#1406](https://github.com/torrentpier/torrentpier/pull/1406), [\#1408](https://github.com/torrentpier/torrentpier/pull/1408), [\#1409](https://github.com/torrentpier/torrentpier/pull/1409), [\#1410](https://github.com/torrentpier/torrentpier/pull/1410), [\#1411](https://github.com/torrentpier/torrentpier/pull/1411), [\#1418](https://github.com/torrentpier/torrentpier/pull/1418), [\#1422](https://github.com/torrentpier/torrentpier/pull/1422) ([belomaxorka](https://github.com/belomaxorka)) - Some bugfixes [\#1380](https://github.com/torrentpier/torrentpier/pull/1380) ([belomaxorka](https://github.com/belomaxorka)) - Updated deps [\#1414](https://github.com/torrentpier/torrentpier/pull/1414), [\#1415](https://github.com/torrentpier/torrentpier/pull/1415), [\#1421](https://github.com/torrentpier/torrentpier/pull/1421) ([belomaxorka](https://github.com/belomaxorka)) - New Crowdin updates [\#1384](https://github.com/torrentpier/torrentpier/pull/1384), [\#1389](https://github.com/torrentpier/torrentpier/pull/1389), [\#1392](https://github.com/torrentpier/torrentpier/pull/1392), [\#1402](https://github.com/torrentpier/torrentpier/pull/1402), [\#1403](https://github.com/torrentpier/torrentpier/pull/1403), [\#1412](https://github.com/torrentpier/torrentpier/pull/1412), [\#1420](https://github.com/torrentpier/torrentpier/pull/1420) ([Exileum](https://github.com/Exileum)) diff --git a/src/Legacy/Common/User.php b/src/Legacy/Common/User.php index 512d4e455..a6e4779d3 100644 --- a/src/Legacy/Common/User.php +++ b/src/Legacy/Common/User.php @@ -468,13 +468,7 @@ class User public function set_session_cookies($user_id) { if ($user_id == GUEST_UID) { - $delete_cookies = [ - COOKIE_DATA, - 'torhelp', - 'explain', - 'sql_log', - 'sql_log_full', - ]; + $delete_cookies = [COOKIE_DATA, 'torhelp']; foreach ($delete_cookies as $cookie) { if (isset($_COOKIE[$cookie])) { diff --git a/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl index 59c64afbc..fea1e6a4b 100644 --- a/styles/templates/default/tracker.tpl +++ b/styles/templates/default/tracker.tpl @@ -396,7 +396,7 @@ ajax.callback.view_post = function(data) { {tor.FORUM_NAME} - onclick="ajax.view_post({tor.POST_ID}, this); return false;" href="{TOPIC_URL}{tor.TOPIC_ID}">{tor.TOPIC_TITLE}{tor.TOR_TYPE}{tor.TOPIC_TITLE} + onclick="ajax.view_post({tor.POST_ID}, this); return false;" href="{TOPIC_URL}{tor.TOPIC_ID}">{L_TOPIC_POLL} {tor.TOPIC_TITLE}{tor.TOR_TYPE}{tor.TOPIC_TITLE}
{tor.TOPIC_TIME}
diff --git a/tracker.php b/tracker.php index feccfe023..7ad87f548 100644 --- a/tracker.php +++ b/tracker.php @@ -655,7 +655,7 @@ if ($allowed_forums) { $select = " SELECT tor.topic_id, tor.post_id, tor.attach_id, tor.size, tor.reg_time, tor.complete_count, tor.seeder_last_seen, tor.tor_status, tor.tor_type, - t.topic_title, t.topic_time, t.topic_replies, t.topic_views, sn.seeders, sn.leechers, tor.info_hash, tor.info_hash_v2, ad.download_count + t.topic_title, t.topic_time, t.topic_replies, t.topic_views, t.topic_vote, sn.seeders, sn.leechers, tor.info_hash, tor.info_hash_v2, ad.download_count "; $select .= (!$hide_speed) ? ", sn.speed_up, sn.speed_down" : ''; $select .= (!$hide_forum) ? ", tor.forum_id" : ''; @@ -742,6 +742,7 @@ if ($allowed_forums) { 'ROW_NUM' => $row_num, 'DL_CLASS' => $dl_class, 'IS_NEW' => (!IS_GUEST && $tor['reg_time'] > $lastvisit), + 'POLL' => (bool)$tor['topic_vote'], 'USER_AUTHOR' => (!IS_GUEST && $poster_id == $user_id), 'ATTACH_ID' => $att_id,