aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-03 02:43:41 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2002-10-03 02:43:41 +0000
commit268d936f4673974e46d16d8ddd7edba1422aba9a (patch)
tree0e3ef51b37a4f4ebe10dd75af26cd2ba099e8790 /phpBB/admin
parent1666e7d3e733bf81b460497ac334232258c343fa (diff)
downloadforums-268d936f4673974e46d16d8ddd7edba1422aba9a.tar
forums-268d936f4673974e46d16d8ddd7edba1422aba9a.tar.gz
forums-268d936f4673974e46d16d8ddd7edba1422aba9a.tar.bz2
forums-268d936f4673974e46d16d8ddd7edba1422aba9a.tar.xz
forums-268d936f4673974e46d16d8ddd7edba1422aba9a.zip
Subforums handling part 2, it almost works. Also added: the "Explain" link at the bottom page, can be removed easily before official release if necessary.
git-svn-id: file:///svn/phpbb/trunk@2913 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin')
-rw-r--r--phpBB/admin/admin_forums.php17
1 files changed, 13 insertions, 4 deletions
diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php
index 1f74bb0bf9..a15fb902c6 100644
--- a/phpBB/admin/admin_forums.php
+++ b/phpBB/admin/admin_forums.php
@@ -231,7 +231,7 @@ switch ($mode)
'prune_enable' => (!empty($_POST['prune_enable'])) ? 1 : 0,
'prune_days' => intval($_POST['prune_days']),
'prune_freq' => intval($_POST['prune_freq']),
- 'display_on_index' => (!empty($_POST['display_on_index'])) ? 0 : 1,
+ 'display_on_index' => (!isset($_POST['display_on_index']) || !empty($_POST['display_on_index'])) ? 1 : 0,
'post_count_inc' => (!empty($_POST['disable_post_count'])) ? 0 : 1
);
@@ -477,12 +477,21 @@ switch ($mode)
<td class="row2">
<input type="checkbox" name="disable_post_count" <?php echo ((!empty($post_count_inc)) ? '' : 'checked="checked" ') ?>/><?php echo $lang['Disable_post_count'] ?>
<?php
- if ($mode == 'edit')
+ if ($mode == 'edit' && $parent_id > 0)
{
+ //
+ // if this forum is a subforum put the "display on index" checkbox
+ //
+ if ($parent_info = get_forum_info($parent_id))
+ {
+ if ($parent_info['parent_id'] > 0 || $parent_info['forum_status'] != ITEM_CATEGORY)
+ {
?>
- <br />
- <input type="checkbox" name="display_on_index" <?php echo ((!empty($display_on_index)) ? '' : 'checked="checked" ') ?>/><?php echo $lang['Display_on_index'] ?>
+ <br />
+ <input type="checkbox" name="display_on_index" <?php echo ((!empty($display_on_index)) ? '' : 'checked="checked" ') ?>/><?php echo $lang['Display_on_index'] ?>
<?php
+ }
+ }
}
?>
</td></tr>