mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8940 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
3b25f4b180
commit
b9cd8f2966
5 changed files with 7 additions and 4 deletions
|
@ -139,6 +139,7 @@
|
||||||
<li>[Change] Make topic selection for merge less confusing by removing unneeded controls. (Bug #21925)</li>
|
<li>[Change] Make topic selection for merge less confusing by removing unneeded controls. (Bug #21925)</li>
|
||||||
<li>[Change] MCP topic view checkboxes now default to unchecked.</li>
|
<li>[Change] MCP topic view checkboxes now default to unchecked.</li>
|
||||||
<li>[Change] Adjust language key <em>SPLIT_AFTER</em> to make the action clearer.</li>
|
<li>[Change] Adjust language key <em>SPLIT_AFTER</em> to make the action clearer.</li>
|
||||||
|
<li>[Change] Add links to the post and forum when viewing a report from the MCP. (Bugs #33795, #33805)</li>
|
||||||
|
|
||||||
<li>[Feature] Allow limited inheritance for template sets.</li>
|
<li>[Feature] Allow limited inheritance for template sets.</li>
|
||||||
<li>[Feature] Allow hard disabling of the template editor.</li>
|
<li>[Feature] Allow hard disabling of the template editor.</li>
|
||||||
|
|
|
@ -65,7 +65,7 @@ class mcp_reports
|
||||||
{
|
{
|
||||||
case 'report_details':
|
case 'report_details':
|
||||||
|
|
||||||
$user->add_lang('posting');
|
$user->add_lang(array('posting', 'viewforum'));
|
||||||
|
|
||||||
$post_id = request_var('p', 0);
|
$post_id = request_var('p', 0);
|
||||||
|
|
||||||
|
@ -200,6 +200,7 @@ class mcp_reports
|
||||||
'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']),
|
'U_MCP_USER_NOTES' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $post_info['user_id']),
|
||||||
'U_MCP_WARN_REPORTER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '',
|
'U_MCP_WARN_REPORTER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $report['user_id']) : '',
|
||||||
'U_MCP_WARN_USER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '',
|
'U_MCP_WARN_USER' => ($auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $post_info['user_id']) : '',
|
||||||
|
'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $post_info['forum_id']),
|
||||||
'U_VIEW_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']),
|
'U_VIEW_POST' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&p=' . $post_info['post_id'] . '#p' . $post_info['post_id']),
|
||||||
'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']),
|
'U_VIEW_TOPIC' => append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'f=' . $post_info['forum_id'] . '&t=' . $post_info['topic_id']),
|
||||||
|
|
||||||
|
|
|
@ -346,6 +346,7 @@ $lang = array_merge($lang, array(
|
||||||
'USER_WARNING_ADDED' => 'User warned successfully.',
|
'USER_WARNING_ADDED' => 'User warned successfully.',
|
||||||
|
|
||||||
'VIEW_DETAILS' => 'View details',
|
'VIEW_DETAILS' => 'View details',
|
||||||
|
'VIEW_POST' => 'View post',
|
||||||
|
|
||||||
'WARNED_USERS' => 'Warned users',
|
'WARNED_USERS' => 'Warned users',
|
||||||
'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them.',
|
'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them.',
|
||||||
|
|
|
@ -50,7 +50,7 @@
|
||||||
</ul>
|
</ul>
|
||||||
<!-- ENDIF -->
|
<!-- ENDIF -->
|
||||||
|
|
||||||
<h3>{POST_SUBJECT}</h3>
|
<h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
|
||||||
<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {POST_DATE}</p>
|
<p class="author">{MINI_POST_IMG} {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} {L_POSTED_ON_DATE} {POST_DATE}</p>
|
||||||
|
|
||||||
<!-- IF S_POST_UNAPPROVED -->
|
<!-- IF S_POST_UNAPPROVED -->
|
||||||
|
@ -152,7 +152,7 @@
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="inner"><span class="corners-top"><span></span></span>
|
<div class="inner"><span class="corners-top"><span></span></span>
|
||||||
|
|
||||||
<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p>
|
<p><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></p>
|
||||||
|
|
||||||
<span class="corners-bottom"><span></span></span></div>
|
<span class="corners-bottom"><span></span></span></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
<th colspan="2" align="center">{L_POST_DETAILS}</th>
|
<th colspan="2" align="center">{L_POST_DETAILS}</th>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
|
<td class="row3" colspan="2" align="center"><span class="gensmall"><!-- IF S_MCP_QUEUE -->{RETURN_QUEUE} | {RETURN_TOPIC_SIMPLE} | {RETURN_POST}<!-- ELSEIF S_MCP_REPORT -->{RETURN_REPORTS} | <a href="{U_VIEW_POST}">{L_VIEW_POST}</a> | <a href="{U_VIEW_TOPIC}">{L_VIEW_TOPIC}</a> | <a href="{U_VIEW_FORUM}">{L_VIEW_FORUM}</a><!-- ELSE -->{RETURN_TOPIC}<!-- ENDIF --></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
|
<td class="row1"><b class="gen">{L_POST_SUBJECT}: </b></td>
|
||||||
|
|
Loading…
Add table
Reference in a new issue