diff options
| author | chang-zhao <chang-zhao@users.noreply.github.com> | 2015-03-21 15:43:06 +0300 |
|---|---|---|
| committer | chang-zhao <chang-zhao@users.noreply.github.com> | 2015-03-21 15:43:06 +0300 |
| commit | 04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15 (patch) | |
| tree | f2a0e5062f11e393a0621324e971626f1b5d8c7d /conf | |
| parent | ba5dadc95a458f1ce06b6c61978acf9330c9f3d5 (diff) | |
| parent | 8a6a4be3f464afb3d69b51b74d95e8fbf21ea2df (diff) | |
| download | rpg-04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15.tar.gz rpg-04b2c4dcc9d6084cfaa455fb4db8e87ba70f4d15.tar.bz2 | |
Merge pull request #1 from splitbrain/master
Test
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/interwiki.conf | 4 | ||||
| -rw-r--r-- | conf/wordblock.conf | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/conf/interwiki.conf b/conf/interwiki.conf index d961912e5..4857e27f3 100644 --- a/conf/interwiki.conf +++ b/conf/interwiki.conf @@ -32,6 +32,6 @@ google.de http://www.google.de/search?q= go http://www.google.com/search?q={URL}&btnI=lucky user :user:{NAME} -# To support VoIP/SIP links +# To support VoIP/SIP/TEL links callto callto://{NAME} - +tel tel:{NAME} diff --git a/conf/wordblock.conf b/conf/wordblock.conf index fc939a4d4..3040fa08f 100644 --- a/conf/wordblock.conf +++ b/conf/wordblock.conf @@ -2,16 +2,12 @@ # patches welcome # https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine) -gay\s*sex -bi\s*sex -incest +https?:\/\/(\S*?)(bi\s*sex|gay\s*sex|fetish|incest|penis|\brape\b) zoosex gang\s*bang facials ladyboy -fetish \btits\b -\brape\b bolea\.com 52crystal baida\.org |