diff options
| author | Marcin Łabanowski <marcin@6irc.net> | 2013-01-09 08:35:27 +0100 |
|---|---|---|
| committer | Marcin Łabanowski <marcin@6irc.net> | 2013-01-09 08:35:27 +0100 |
| commit | c18ed4e51a8fa9d7d67fdd14f957f0e6fc0cbea3 (patch) | |
| tree | 7ec8c4076cf8c1863f443dbd0dcfd717f00c1a1b /inc/config.php | |
| parent | f6e9dbed1333f6761de0e748a6a41b6b365158dc (diff) | |
| parent | e145a0ea890f6973f349d8fb342e38a9be4c649b (diff) | |
Merge branch 'master' of https://github.com/asiekierka/Tinyboard
Conflicts:
mod.php
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/inc/config.php b/inc/config.php index 79ac48cb..a6f78053 100644 --- a/inc/config.php +++ b/inc/config.php @@ -651,6 +651,10 @@ array( '/^https?:\/\/video\.google\.com\/videoplay\?docid=(\d+)([&#](.+)?)?$/i', '<embed src="http://video.google.com/googleplayer.swf?docid=$1&hl=en&fs=true" style="width:%%tb_width%%px;height:%%tb_height%%px;float:left;margin:10px 20px" allowFullScreen="true" allowScriptAccess="always" type="application/x-shockwave-flash"></embed>' + ), + array( + '/^https?:\/\/(\w+\.)?vocaroo\.com\/i\/([a-zA-Z0-9]{2,15})$/i', + '<object style="float: left;margin: 10px 20px;" width="148" height="44"><param name="movie" value="http://vocaroo.com/player.swf?playMediaID=$2&autoplay=0"></param><param name="wmode" value="transparent"></param><embed src="http://vocaroo.com/player.swf?playMediaID=$2&autoplay=0" width="148" height="44" wmode="transparent" type="application/x-shockwave-flash"></embed></object>' ) ); @@ -949,7 +953,7 @@ // View whether a thread has been bumplocked ("-1" to allow non-mods to see too) $config['mod']['view_bumplock'] = MOD; // Edit posts (EXPERIMENTAL) - $config['mod']['editpost'] = DISABLED; + $config['mod']['editpost'] = MOD; // "Move" a thread to another board (EXPERIMENTAL; has some known bugs) $config['mod']['move'] = DISABLED; // Bypass "field_disable_*" (forced anonymity, etc.) |