aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_forum.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-10-02 18:22:59 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-10-02 18:22:59 +0000
commit2a7558715393239af9f228ac0bd8963ddbcbb436 (patch)
tree3fae7582b92312e665241daf0469ea49f3a3671c /phpBB/includes/mcp/mcp_forum.php
parent1d688c6b8de0073e637be7601e0efbd5947bce00 (diff)
downloadforums-2a7558715393239af9f228ac0bd8963ddbcbb436.tar
forums-2a7558715393239af9f228ac0bd8963ddbcbb436.tar.gz
forums-2a7558715393239af9f228ac0bd8963ddbcbb436.tar.bz2
forums-2a7558715393239af9f228ac0bd8963ddbcbb436.tar.xz
forums-2a7558715393239af9f228ac0bd8963ddbcbb436.zip
- some additional changes
- fixing pm history bug (quote post) git-svn-id: file:///svn/phpbb/trunk@5243 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp/mcp_forum.php')
-rw-r--r--phpBB/includes/mcp/mcp_forum.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/includes/mcp/mcp_forum.php
index 70548faafc..4ced2b77bf 100644
--- a/phpBB/includes/mcp/mcp_forum.php
+++ b/phpBB/includes/mcp/mcp_forum.php
@@ -13,9 +13,8 @@
*/
function mcp_forum_view($id, $mode, $action, $url, $forum_info)
{
+ global $template, $db, $user, $auth, $cache;
global $SID, $phpEx, $phpbb_root_path, $config;
- global $template, $db, $user, $auth;
- global $_POST, $_REQUEST;
if ($action == 'merge_select')
{
@@ -84,7 +83,7 @@ function mcp_forum_view($id, $mode, $action, $url, $forum_info)
// Grab icons
$icons = array();
- obtain_icons($icons);
+ $cache->obtain_icons($icons);
$topic_rows = array();