diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-02 16:35:48 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-02 16:35:48 +0000 |
| commit | 46c9da77a47abba5f0bb314d9a4cd68d1abb32c9 (patch) | |
| tree | 33183de1bf76a073820ffeafc5d9931381ba125d /phpBB/includes/functions.php | |
| parent | 1c32dcaeb10292de8fa8de25c8775fbdab25e2c7 (diff) | |
| download | forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.gz forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.bz2 forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.tar.xz forums-46c9da77a47abba5f0bb314d9a4cd68d1abb32c9.zip | |
- do not allow setting the parent to currently assigned childs [Bug #6708]
- Allow the display_on_index setting to be specified for link forums [Bug #6660]
- Rank code in functions_display.php [Bug #6656]
- Added some new locations for the viewonline page [Related to bug #6484]
- Do not display attached images inline if user disabled image display in posts; the same with flash files [Bug #6226]
git-svn-id: file:///svn/phpbb/trunk@6829 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8e1df45cb0..5206e51fdd 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2620,6 +2620,17 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, } } + // Make some descisions based on user options being set. + if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) + { + $display_cat = ATTACHMENT_CATEGORY_NONE; + } + + if ($display_cat == ATTACHMENT_CATEGORY_FLASH && !$user->optionget('viewflash')) + { + $display_cat = ATTACHMENT_CATEGORY_NONE; + } + $download_link = (!$force_physical && $attachment['attach_id']) ? append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&f=' . (int) $forum_id) : $filename; switch ($display_cat) |