diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-03-08 17:56:24 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-03-08 17:56:24 +0000 |
| commit | 38176447a838fb1627dfb038f90769c3c80785d3 (patch) | |
| tree | a4c0c7e0736b307bb4c3fffa9bd171cdf0936db9 /phpBB/includes/mcp | |
| parent | 91720e826f14130485ccc306a93e5dd0fbf2946f (diff) | |
| download | forums-38176447a838fb1627dfb038f90769c3c80785d3.tar forums-38176447a838fb1627dfb038f90769c3c80785d3.tar.gz forums-38176447a838fb1627dfb038f90769c3c80785d3.tar.bz2 forums-38176447a838fb1627dfb038f90769c3c80785d3.tar.xz forums-38176447a838fb1627dfb038f90769c3c80785d3.zip | |
- log entries for deleted topics don't provide a link to the topic or to the topic logs, do we need to change handling of this else where?
- added select all/deselect all to mcp_forum
- realigned mcp_forum.html
- don't display announcements on all pages in mcp_forum => easier use of "select all" + delete/other function
git-svn-id: file:///svn/phpbb/trunk@5609 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_forum.php | 16 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 4 |
2 files changed, 2 insertions, 18 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php index ce99fc05d7..d3f9417df8 100644 --- a/phpBB/includes/mcp/mcp_forum.php +++ b/phpBB/includes/mcp/mcp_forum.php @@ -89,22 +89,6 @@ function mcp_forum_view($id, $mode, $action, $forum_info) FROM ' . TOPICS_TABLE . " t WHERE (t.forum_id = $forum_id OR t.forum_id = 0) " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . " - AND t.topic_type IN (" . POST_ANNOUNCE . ", " . POST_GLOBAL . ") - $limit_time_sql - ORDER BY $sort_order_sql"; - $result = $db->sql_query($sql); - - while ($row = $db->sql_fetchrow($result)) - { - $topic_rows[] = $row; - } - $db->sql_freeresult($result); - - $sql = 'SELECT t.* - FROM ' . TOPICS_TABLE . " t - WHERE t.forum_id = $forum_id - " . (($auth->acl_get('m_approve', $forum_id)) ? '' : 'AND t.topic_approved = 1') . ' - AND t.topic_type IN (' . POST_NORMAL . ', ' . POST_STICKY . ") $limit_time_sql ORDER BY t.topic_type DESC, $sort_order_sql"; $result = $db->sql_query_limit($sql, $topics_per_page, $start); diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index 6c2c4df406..372ccc023f 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -187,8 +187,8 @@ function mcp_front_view($id, $mode, $action) 'IP' => $row['ip'], 'TIME' => $user->format_date($row['time']), 'ACTION' => $row['action'], - 'U_VIEWTOPIC' => $row['viewtopic'], - 'U_VIEWLOGS' => $row['viewlogs']) + 'U_VIEWTOPIC' => isset($row['viewtopic']) ? $row['viewtopic'] : '', + 'U_VIEWLOGS' => isset($row['viewlogs']) ? $row['viewlogs'] : '') ); } } |