diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-04-09 21:20:24 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-04-09 21:20:24 +0000 |
| commit | fc394d6302b45ff61d8c55e3e9516f3c212bf04c (patch) | |
| tree | 4be365327698f094cb78f0a3825a19498d954843 /phpBB/viewtopic.php | |
| parent | 5b24c3a7fb5eaef0c6a1374eff1435322097f0b9 (diff) | |
| download | forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.gz forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.bz2 forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.tar.xz forums-fc394d6302b45ff61d8c55e3e9516f3c212bf04c.zip | |
- check m_ permission for quickmod [Bug #1317]
- don't sync the global forum (id 0) [Bug #1383]
- corrections to available time zones [Bug #1306]
- only display open reports on mcp_front
- added whois information to mcp_post [Bug #1400]
- copy "dot" when copying a topic [Bug #1321]
- some language corrections [Bugs #1324, #1255, #1317]
- mozWrap scrolls back to previous position now [Bug #1190]
- some style related corrections [Bugs #1322, #1454, #1316]
- corrected copyrights [Bug #1468]
- fixed links on search results page [Bug #1469]
git-svn-id: file:///svn/phpbb/trunk@5779 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c6e13fcec4..a1dfeff11a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -423,11 +423,11 @@ $topic_mod .= ($auth->acl_get('m_delete', $forum_id)) ? '<option value="delete_t $topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="move">' . $user->lang['MOVE_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_split', $forum_id)) ? '<option value="split">' . $user->lang['SPLIT_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_merge', $forum_id)) ? '<option value="merge">' . $user->lang['MERGE_TOPIC'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '<option value="fork">' . $user->lang['FORK_TOPIC'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_move', $forum_id)) ? '<option value="fork">' . $user->lang['FORK_TOPIC'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_', $forum_id) && $topic_data['topic_type'] != POST_NORMAL) ? '<option value="make_normal">' . $user->lang['MAKE_NORMAL'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '<option value="make_sticky">' . $user->lang['MAKE_STICKY'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '<option value="make_announce">' . $user->lang['MAKE_ANNOUNCE'] . '</option>' : ''; -$topic_mod .= ($auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '<option value="make_global">' . $user->lang['MAKE_GLOBAL'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_sticky', $forum_id) && $topic_data['topic_type'] != POST_STICKY) ? '<option value="make_sticky">' . $user->lang['MAKE_STICKY'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_ANNOUNCE) ? '<option value="make_announce">' . $user->lang['MAKE_ANNOUNCE'] . '</option>' : ''; +$topic_mod .= ($auth->acl_get('m_', $forum_id) && $auth->acl_get('f_announce', $forum_id) && $topic_data['topic_type'] != POST_GLOBAL) ? '<option value="make_global">' . $user->lang['MAKE_GLOBAL'] . '</option>' : ''; $topic_mod .= ($auth->acl_get('m_', $forum_id)) ? '<option value="topic_logs">' . $user->lang['VIEW_TOPIC_LOGS'] . '</option>' : ''; // If we've got a hightlight set pass it on to pagination. |