Conflicts:
	inc/config.php
This commit is contained in:
kaf 2014-04-19 13:09:16 +00:00 committed by czaks
parent f83c87b623
commit b102fd5f4e

View File

@ -531,12 +531,12 @@
$config['country_flags_condensed'] = true; $config['country_flags_condensed'] = true;
$config['country_flags_condensed_css'] = 'static/flags/flags.css'; $config['country_flags_condensed_css'] = 'static/flags/flags.css';
// Let the user choose a /pol/-like user_flag that will be shown in the post. For the user flags, please be aware // Allow the user choose a /pol/-like user_flag that will be shown in the post. For the user flags, please be aware
// that you will have to disable BOTH country_flags and contry_flags_condensed optimization (at least on a board // that you will have to disable BOTH country_flags and contry_flags_condensed optimization (at least on a board
// where they are enabled). // where they are enabled).
$config['user_flag'] = false; $config['user_flag'] = false;
// List of user_flag the user can choose. Flag must be placed in the directory set by $config['uri_flags'] // List of user_flag the user can choose. Flags must be placed in the directory set by $config['uri_flags']
$config['user_flags'] = []; $config['user_flags'] = [];
/* example:  /* example: 
$config['user_flags'] = array ( $config['user_flags'] = array (