aboutsummaryrefslogtreecommitdiffstats
path: root/htconfig.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-31 15:26:02 -0800
committerFriendika <info@friendika.com>2011-01-31 15:26:02 -0800
commit082909fe1a861219c4f9159f8f8df5aea7546da9 (patch)
tree1a1ed610cb668e2cbff10e95ebec1ffed19b58f9 /htconfig.php
parentfc20fb17c299100fd39e900f20c70d823baaebdf (diff)
parentbdbbfe17b0ab58a89a0673f5409d30870afd0b9d (diff)
downloadvolse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.gz
volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.bz2
volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.zip
Merge branch 'fabrixxm-oembed'
Diffstat (limited to 'htconfig.php')
-rw-r--r--htconfig.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/htconfig.php b/htconfig.php
index 13c065e69..5f5c76cbd 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -72,4 +72,7 @@ $a->config['system']['rino_encrypt'] = true;
$a->config['system']['addon'] = 'js_upload';
- \ No newline at end of file
+// Disable oembed embedding
+// This disable the conversion of [embed]$url[/embed] tag in html
+// $a->config['system']['no_oembed'] = true;
+