From bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c Mon Sep 17 00:00:00 2001 From: the_systech Date: Tue, 19 Jun 2001 17:38:00 +0000 Subject: added auto_prune git-svn-id: file:///svn/phpbb/trunk@516 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/common.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'phpBB/common.php') diff --git a/phpBB/common.php b/phpBB/common.php index f93255bc2c..09dcdb6e6e 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -6,11 +6,7 @@ * copyright : (C) 2001 The phpBB Group * email : support@phpbb.com * -<<<<<<< common.php * $Id$ -======= - * $Id$ ->>>>>>> 1.24 * * ***************************************************************************/ @@ -125,7 +121,7 @@ else $board_config['avatar_max_width'] = $config['avatar_max_width']; $board_config['avatar_max_height'] = $config['avatar_max_height']; $board_config['avatar_path'] = $config['avatar_path']; + $board_config['prune_enable'] = $config['prune_enable']; } include('language/lang_'.$board_config['default_lang'].'.'.$phpEx); - -?> \ No newline at end of file +?> -- cgit v1.2.1