aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-03-13 01:04:53 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-03-13 01:04:53 +0000
commitdc71f0abb7783d0d40badd74834baabbb1d59097 (patch)
tree58088ac1748530a5122b4f04b21e8986618ad214
parent902beb10ef1224d985bcb20334cab1132a689f3b (diff)
downloadforums-dc71f0abb7783d0d40badd74834baabbb1d59097.tar
forums-dc71f0abb7783d0d40badd74834baabbb1d59097.tar.gz
forums-dc71f0abb7783d0d40badd74834baabbb1d59097.tar.bz2
forums-dc71f0abb7783d0d40badd74834baabbb1d59097.tar.xz
forums-dc71f0abb7783d0d40badd74834baabbb1d59097.zip
Please try not to notice.
git-svn-id: file:///svn/phpbb/trunk@3643 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/viewtopic.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 3d136a1b55..ea1b413003 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -283,6 +283,9 @@ $topic_mod .= ($auth->acl_gets('m_delete', 'a_', $forum_id)) ? '<option value="d
$topic_mod .= ($auth->acl_gets('m_move', 'a_', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : '';
$topic_mod .= ($auth->acl_gets('m_split', 'a_', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : '';
$topic_mod .= ($auth->acl_gets('m_merge', 'a_', $forum_id)) ? '<option value="merge">' . $user->lang['MERGE_TOPIC'] . '</option>' : '';
+$topic_mod .= (($topic_type != POST_ANNOUNCE) && $auth->acl_gets('m_', 'a_', $forum_id)) ? '<option value="set_announce">' . $user->lang['CHANGE_TOPIC_TYPE'] . $user->lang['POST_ANNOUNCEMENT'] . '</option>' : '';
+$topic_mod .= (($topic_type != POST_STICKY) && $auth->acl_gets('m_', 'a_', $forum_id)) ? '<option value="set_sticky">' . $user->lang['CHANGE_TOPIC_TYPE'] . $user->lang['POST_STICKY'] . '</option>' : '';
+$topic_mod .= (($topic_type != POST_NORMAL) && $auth->acl_gets('m_', 'a_', $forum_id)) ? '<option value="set_normal">' . $user->lang['CHANGE_TOPIC_TYPE'] . $user->lang['POST_NORMAL'] . '</option>' : '';
// If we've got a hightlight set pass it on to pagination.
@@ -856,7 +859,7 @@ if ($row = $db->sql_fetchrow($result))
'YIM_IMG' => $user_cache[$poster_id]['yim_img'],
'YIM' => $user_cache[$poster_id]['yim'],
- 'S_POST_REPORTED' => (!empty($row['post_reported']) && $auth->acl_gets('m_', 'a_', $forum_id)) ? TRUE : FALSE,
+ 'S_POST_REPORTED' => ($row['post_reported'] && $auth->acl_gets('m_', 'a_', $forum_id)) ? TRUE : FALSE,
'U_REPORT' => "report.$phpEx$SID&amp;p=" . $row['post_id'],
'U_MCP_REPORT' => "mcp.$phpEx$SID&amp;mode=post_details&amp;p=" . $row['post_id'],
// no img yet as I could not get the subSilver to work with PSP - Ashe
@@ -868,7 +871,7 @@ if ($row = $db->sql_fetchrow($result))
'S_ROW_COUNT' => $i++,
- 'S_POST_UNAPPROVED' => (!empty($row['post_approved'])) ? TRUE : FALSE,
+ 'S_POST_UNAPPROVED' => ($row['post_approved']) ? FALSE : TRUE,
'U_MCP_APPROVE' => "mcp.$phpEx$SID&amp;mode=approve&amp;p=" . $row['post_id'],
'U_MINI_POST' => $mini_post_url,