aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorthe_systech <the_systech@users.sourceforge.net>2001-06-19 17:38:00 +0000
committerthe_systech <the_systech@users.sourceforge.net>2001-06-19 17:38:00 +0000
commitbc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c (patch)
treef63000a1477dfe67c526f08f80558e5ed3e6db00 /phpBB/common.php
parent7d6c996092ec92c1081f05626af0d284dc94bb8a (diff)
downloadforums-bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c.tar
forums-bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c.tar.gz
forums-bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c.tar.bz2
forums-bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c.tar.xz
forums-bc5c16ae8275c2ac79ecd260c6dbb56aa2a8948c.zip
added auto_prune
git-svn-id: file:///svn/phpbb/trunk@516 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php8
1 files changed, 2 insertions, 6 deletions
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
+?>