diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:22:59 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-10-02 18:22:59 +0000 |
| commit | 2a7558715393239af9f228ac0bd8963ddbcbb436 (patch) | |
| tree | 3fae7582b92312e665241daf0469ea49f3a3671c /phpBB/includes/ucp/ucp_pm_viewmessage.php | |
| parent | 1d688c6b8de0073e637be7601e0efbd5947bce00 (diff) | |
| download | forums-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/ucp/ucp_pm_viewmessage.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index f8bbfb10f6..9408352335 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -13,7 +13,8 @@ */ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) { - global $phpbb_root_path, $phpEx, $SID, $user, $template, $auth, $config, $db; + global $user, $template, $auth, $db, $cache; + global $phpbb_root_path, $phpEx, $SID, $config; $user->add_lang(array('viewtopic', 'memberlist')); @@ -35,7 +36,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) // Grab icons $icons = array(); - obtain_icons($icons); + $cache->obtain_icons($icons); // Instantiate BBCode if need be if ($message_row['bbcode_bitfield']) @@ -369,7 +370,8 @@ function message_history($msg_id, $user_id, $message_row, $folder) */ function get_user_informations($user_id, $user_row) { - global $config, $db, $auth, $user, $phpbb_root_path, $phpEx, $SID; + global $db, $auth, $user, $cache; + global $phpbb_root_path, $phpEx, $SID, $config; if (!$user_id) { @@ -383,7 +385,7 @@ function get_user_informations($user_id, $user_row) // Grab ranks $ranks = array(); - obtain_ranks($ranks); + $cache->obtain_ranks($ranks); // Generate online information for user if ($config['load_onlinetrack']) |