github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r502

Browse source 
Исправлен баг в 501 + чуток марафета git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@502 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
gemini_13@torba.su 2013-05-23 09:56:09 +00:00
commit 73bde22a72
5 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/includes/page_header.php
View file

@ -276,6 +276,8 @@ $template->assign_vars(array(
'SELECTED' => HTML_SELECTED,
'U_SEARCH_SELF_BY_LAST' => "search.php?uid={$userdata['user_id']}&o=5",
'U_WATCHED_TOPICS' => "profile.php?mode=watch",
'U_MY_DRAFTS' => "profile.php?mode=viewdraft&u={$userdata['user_id']}",
));
if (!empty($page_cfg['show_torhelp'][BB_SCRIPT]) && !empty($userdata['torhelp']))

2
upload/includes/ucp/usercp_viewprofile.php
View file

@ -143,7 +143,7 @@ $template->assign_vars(array(
'U_SEARCH_USER' => "search.php?search_author=1&uid={$profiledata['user_id']}",
'U_SEARCH_TOPICS' => "search.php?uid={$profiledata['user_id']}&myt=1",
'U_SEARCH_RELEASES' => "tracker.php?rid={$profiledata['user_id']}#results",
'U_WATCHED_TOPICS' => "profile.php?mode=watch",
'U_DRAFTS' => "profile.php?mode=viewdraft&u={$profiledata['user_id']}",
'S_PROFILE_ACTION' => 'profile.php',

6
upload/search.php
View file

@ -465,7 +465,7 @@ if ($post_mode)
// Run initial search for post_ids
if (!$items_found)
{
$join_t = ($title_match || $my_topics || $new_topics || in_array($order_val, array($ord_last_p, $ord_created, $ord_name, $ord_repl)));
$join_t = ($title_match || $my_topics || $new_topics || in_array($order_val, array($ord_last_p, $ord_created, $ord_name, $ord_repl || $bb_cfg['status_of_draft'])));
$join_s = ($text_match_sql && !$title_match);
$join_p = ($my_posts || $join_s);
@ -476,7 +476,7 @@ if ($post_mode)
$SQL['SELECT'][] = ($join_t && !$join_p) ? 't.topic_first_post_id AS item_id' : 'p.post_id AS item_id';
// FROM
if ($join_t || $bb_cfg['status_of_draft']) $SQL['FROM'][] = $topics_tbl;
if ($join_t) $SQL['FROM'][] = $topics_tbl;
if ($join_p) $SQL['FROM'][] = $posts_tbl;
if (!$SQL['FROM'])
@ -629,7 +629,7 @@ else
// Run initial search for topic_ids
if (!$items_found)
{
$join_t = ($title_match || $my_topics || $new_topics || $dl_search || $new_posts || in_array($order_val, array($ord_last_p, $ord_created, $ord_name, $ord_repl)));
$join_t = ($title_match || $my_topics || $new_topics || $dl_search || $new_posts || in_array($order_val, array($ord_last_p, $ord_created, $ord_name, $ord_repl || $bb_cfg['status_of_draft'])));
$join_s = ($text_match_sql && !$title_match);
$join_p = ($my_posts || $join_s);
$join_dl = ($dl_search);

3
upload/templates/default/page_header.tpl
View file

@ -462,9 +462,10 @@ $(document).ready(function() {
<div class="menu-sub" id="dls-menu">
<div class="menu-a bold nowrap">
<a class="med" href="{U_TRACKER}?rid={SESSION_USER_ID}#results">{L_CUR_UPLOADS}</a>
<a class="med" href="{U_CUR_DOWNLOADS}#torrent">{L_CUR_DOWNLOADS}</a>
<a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlc=1">{L_SEARCH_DL_COMPLETE_DOWNLOADS}</a>
<a class="med" href="{U_SEARCH}?dlu={SESSION_USER_ID}&dlw=1">{L_SEARCH_DL_WILL_DOWNLOADS}</a>
<a class="med" href="{U_WATCHED_TOPICS}">{L_WATCHED_TOPICS}</a>
<a class="med" href="{U_MY_DRAFTS}">{L_DRAFTS}</a>
</div>
</div>
<!-- ELSE -->

2
upload/templates/default/usercp_viewprofile.tpl
View file

@ -418,7 +418,7 @@ ajax.callback.view_profile = function(data) {
<!-- IF SHOW_DRAFT -->
<tr>
<th>{L_DRAFTS}:</th>
<td><a href="profile.php?mode=viewdraft&u={PROFILE_USER_ID}"><b>{COUNT_DRAFT}</b></a></td>
<td><a href="{U_DRAFTS}"><b>{COUNT_DRAFT}</b></a></td>
</tr>
<!-- ENDIF -->
<tr>