Changeset 702 for trunk/forum/includes/mcp/mcp_topic.php
- Timestamp:
- Mar 31, 2010, 6:32:40 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/forum/includes/mcp/mcp_topic.php
r400 r702 3 3 * 4 4 * @package mcp 5 * @version $Id : mcp_topic.php 9030 2008-10-19 18:32:11Z acydburn$5 * @version $Id$ 6 6 * @copyright (c) 2005 phpBB Group 7 7 * @license http://opensource.org/licenses/gpl-license.php GNU Public License … … 107 107 if ($total == -1) 108 108 { 109 $total = $topic_info['topic_replies'] + 1; 109 if ($auth->acl_get('m_approve', $topic_info['forum_id'])) 110 { 111 $total = $topic_info['topic_replies_real'] + 1; 112 } 113 else 114 { 115 $total = $topic_info['topic_replies'] + 1; 116 } 110 117 } 111 118 … … 260 267 $s_topic_icons = false; 261 268 262 if ($auth->acl_get ('m_split',$topic_info['forum_id']))269 if ($auth->acl_gets('m_split', 'm_merge', (int) $topic_info['forum_id'])) 263 270 { 264 271 include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); … … 302 309 'ACTION' => $action, 303 310 304 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED', false, true), 305 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true), 311 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'), 312 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'), 313 'INFO_IMG' => $user->img('icon_post_info', 'VIEW_INFO'), 306 314 307 315 'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start", … … 502 510 503 511 // Update forum statistics 504 set_config ('num_topics', $config['num_topics'] +1, true);512 set_config_count('num_topics', 1, true); 505 513 506 514 // Link back to both topics
Note:
See TracChangeset
for help on using the changeset viewer.