diff options
| author | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2014-06-20 23:27:34 +0200 |
| commit | 73177fcffc040d1c225782fe85f09576a39f6890 (patch) | |
| tree | b101f49b4ff3b2b00d20b874abd702bb04ea6220 /inc/config.php | |
| parent | 9e2b722db6784226b1394ddf957aa9a4a16ac9a9 (diff) | |
| parent | 7933abd271b5bb3578cd80f62302cc6ac8961b91 (diff) | |
Merge branch '4.5' of github.com:vichan-devel/Tinyboard into HEAD
Conflicts:
templates/themes/basic/index.html
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/inc/config.php b/inc/config.php index 275291b9..416209b7 100644 --- a/inc/config.php +++ b/inc/config.php @@ -1096,9 +1096,9 @@ // Static images. These can be URLs OR base64 (data URI scheme). These are only used if // $config['font_awesome'] is false (default). - // $config['image_sticky'] = 'static/sticky.gif'; + // $config['image_sticky'] = 'static/sticky.png'; // $config['image_locked'] = 'static/locked.gif'; - // $config['image_bumplocked'] = 'static/sage.gif'. + // $config['image_bumplocked'] = 'static/sage.png'. // If you want to put images and other dynamic-static stuff on another (preferably cookieless) domain. // This will override $config['root'] and $config['dir']['...'] directives. "%s" will get replaced with @@ -1433,6 +1433,9 @@ // 'db', // ); + // Allow OP to remove arbitrary posts in his thread + $config['user_moderation'] = false; + /* * ==================== * Public post search |