summaryrefslogtreecommitdiff
path: root/inc/config.php
diff options
context:
space:
mode:
authorMichael <savetheinternet@tinyboard.org>2013-01-18 23:03:16 -0800
committerMichael <savetheinternet@tinyboard.org>2013-01-18 23:03:16 -0800
commitaccc3992f324da39f7725971cff86d080c8f9177 (patch)
treeca7a0f222d0fb5629311850c69b843cfa154b70e /inc/config.php
parent6aac2472e66f87d2d38a3b0bd361e355836be49d (diff)
parent91e8547b0469e0e046bc15cd9c86f7d7abe86999 (diff)
Merge pull request #93 from Macil/image_reject_repost_in_thread
Add image_reject_repost_in_thread option
Diffstat (limited to 'inc/config.php')
-rw-r--r--inc/config.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/inc/config.php b/inc/config.php
index f4951a40..e977f066 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -445,8 +445,10 @@
// Maximum image dimensions
$config['max_width'] = 10000;
$config['max_height'] = $config['max_width']; // 1:1
- // Reject dupliate image uploads
+ // Reject duplicate image uploads
$config['image_reject_repost'] = true;
+ // Reject duplicate image uploads within the same thread. Doesn't change anything if image_reject_repost is true.
+ $config['image_reject_repost_in_thread'] = false;
// Display the aspect ratio in a post's file info
$config['show_ratio'] = false;
@@ -667,6 +669,7 @@
$config['error']['maxsize'] = _('The file was too big.');
$config['error']['invalidzip'] = _('Invalid archive!');
$config['error']['fileexists'] = _('That file <a href="%s">already exists</a>!');
+ $config['error']['fileexistsinthread'] = _('That file <a href="%s">already exists</a> in this thread!');
$config['error']['delete_too_soon'] = _('You\'ll have to wait another %s before deleting that.');
$config['error']['mime_exploit'] = _('MIME type detection XSS exploit (IE) detected; post discarded.');
$config['error']['invalid_embed'] = _('Couldn\'t make sense of the URL of the video you tried to embed.');