Merge branch 'master' of github.com:vichan-devel/Tinyboard into staging

2014-05-04 00:19:45 +02:00
parent 211c1acec9 90666e3674
commit dafe0d5896
6 changed files with 3198 additions and 10 deletions
--- a/inc/config.php
+++ b/inc/config.php
@@ -537,7 +537,7 @@
 	$config['user_flag'] = false;
 	
 	// 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'] = array();
 	/* example: 
 	$config['user_flags'] = array (
 		'nz' => 'Nazi',