diff options
| author | czaks <marcin@6irc.net> | 2013-08-20 18:22:37 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-20 18:22:37 -0400 |
| commit | de035f4a7ecf3e1da0dc408cab424d8a9a81678e (patch) | |
| tree | 1b46b1a80330de57e2b7d1cce3ae2c68bc7ae6ae /inc/config.php | |
| parent | f909fd190af4427dae1a8eddd4fa476c1243c433 (diff) | |
| parent | db8173fe62829644a6cdf2e6a787b2ec2244c15b (diff) | |
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Conflicts:
stylesheets/dark_roach.css
stylesheets/style.css
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/inc/config.php b/inc/config.php index 956851f2..888cbeb8 100644 --- a/inc/config.php +++ b/inc/config.php @@ -357,6 +357,8 @@ // Allow "uploading" images via URL as well. Users can enter the URL of the image and then Tinyboard will // download it. Not usually recommended. $config['allow_upload_by_url'] = false; + // The timeout for the above, in seconds. + $config['upload_by_url_timeout'] = 15; // A wordfilter (sometimes referred to as just a "filter" or "censor") automatically scans users’ posts // as they are submitted and changes or censors particular words or phrases. |