github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-20 21:33:54 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Unique topic page title, undefined language variables fix.

Browse source
This commit is contained in:
Yuriy Pikhtarev 2017-08-07 20:51:04 +03:00
commit 7e757b166b
No known key found for this signature in database
GPG key ID: 3A9B5A757B48ECC6
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
library/language/source/main.php
View file

@ -77,6 +77,7 @@ $lang['SELECT_ACTION'] = 'Select action';
$lang['NEXT_PAGE'] = 'Next'; $lang['NEXT_PAGE'] = 'Next';
$lang['PREVIOUS_PAGE'] = 'Previous'; $lang['PREVIOUS_PAGE'] = 'Previous';
$lang['SHORT_PAGE'] = 'page';
$lang['GOTO_PAGE'] = 'Go to page'; $lang['GOTO_PAGE'] = 'Go to page';
$lang['GOTO_SHORT'] = 'Page'; $lang['GOTO_SHORT'] = 'Page';
$lang['JOINED'] = 'Joined'; $lang['JOINED'] = 'Joined';

1
src/Legacy/Common/User.php
View file

@ -607,6 +607,7 @@ class User
require(LANG_DIR . 'main.php'); require(LANG_DIR . 'main.php');
setlocale(LC_ALL, isset($bb_cfg['lang'][$this->data['user_lang']]['locale']) ? setlocale(LC_ALL, isset($bb_cfg['lang'][$this->data['user_lang']]['locale']) ?
$bb_cfg['lang'][$this->data['user_lang']]['locale'] : 'en_US.UTF-8'); $bb_cfg['lang'][$this->data['user_lang']]['locale'] : 'en_US.UTF-8');
$lang = array_merge($lang, $source_lang);
$theme = setup_style(); $theme = setup_style();
$DeltaTime = new DateDelta(); $DeltaTime = new DateDelta();

9
viewtopic.php
View file

@ -449,10 +449,10 @@ if ($can_watch_topic) {
// If we've got a hightlight set pass it on to pagination, // If we've got a hightlight set pass it on to pagination,
$pg_url = TOPIC_URL . $topic_id; $pg_url = TOPIC_URL . $topic_id;
$pg_url .= ($post_days) ? "&postdays=$post_days" : ''; $pg_url .= $post_days ? "&postdays=$post_days" : '';
$pg_url .= ($post_order != 'asc') ? "&postorder=$post_order" : ''; $pg_url .= ($post_order != 'asc') ? "&postorder=$post_order" : '';
$pg_url .= isset($_REQUEST['single']) ? "&single=1" : ''; $pg_url .= isset($_REQUEST['single']) ? "&single=1" : '';
$pg_url .= ($moderation) ? "&mod=1" : ''; $pg_url .= $moderation ? "&mod=1" : '';
$pg_url .= ($posts_per_page != $bb_cfg['posts_per_page']) ? "&ppp=$posts_per_page" : ''; $pg_url .= ($posts_per_page != $bb_cfg['posts_per_page']) ? "&ppp=$posts_per_page" : '';
generate_pagination($pg_url, $total_replies, $posts_per_page, $start); generate_pagination($pg_url, $total_replies, $posts_per_page, $start);
@ -479,6 +479,9 @@ $poll_time_expired = ($t_data['topic_time'] < TIMENOW - $bb_cfg['poll_max_days']
$can_manage_poll = ($t_data['topic_poster'] == $userdata['user_id'] || $is_auth['auth_mod']); $can_manage_poll = ($t_data['topic_poster'] == $userdata['user_id'] || $is_auth['auth_mod']);
$can_add_poll = ($can_manage_poll && !$topic_has_poll && !$poll_time_expired && !$start); $can_add_poll = ($can_manage_poll && !$topic_has_poll && !$poll_time_expired && !$start);
$page_title = ((int)($start / $posts_per_page) === 0) ? $topic_title :
$topic_title . ' - ' . $lang['SHORT_PAGE'] . ' ' . (floor($start / $posts_per_page) + 1);
// //
// Send vars to template // Send vars to template
// //
@ -491,7 +494,7 @@ $template->assign_vars(array(
'FORUM_ID' => $forum_id, 'FORUM_ID' => $forum_id,
'FORUM_NAME' => htmlCHR($forum_name), 'FORUM_NAME' => htmlCHR($forum_name),
'TOPIC_ID' => $topic_id, 'TOPIC_ID' => $topic_id,
'PAGE_TITLE' => $topic_title, 'PAGE_TITLE' => $page_title,
'TOPIC_TITLE' => wbr($topic_title), 'TOPIC_TITLE' => wbr($topic_title),
'PORNO_FORUM' => $t_data['allow_porno_topic'], 'PORNO_FORUM' => $t_data['allow_porno_topic'],
'REPLY_IMG' => $reply_img, 'REPLY_IMG' => $reply_img,