Merge branch 'master' of https://github.com/friendica/friendica

[friendica.git] / view / fr / htconfig.tpl

diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index d31d5a39ff2a4606a230806daf7cc2e32829c12c..76709ea752df7e37f175a1b6db468db5ee642f44 100644 (file)
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -33,11 +33,11 @@ $a->config['sitename'] = "My Friend Network";
 
 $a->config['register_policy'] = REGISTER_OPEN;
 $a->config['register_text'] = '';
-$a->config['admin_email'] = '';
+$a->config['admin_email'] = '$adminmail';
 
 // Maximum size of an imported message, 0 is unlimited
 
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
 
 // maximum size of uploaded photos
 
@@ -49,8 +49,8 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
-$a->config['system']['directory_search_url'] = 'http://dir.friendika.com/directory?search=';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit';
+$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search=';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
@@ -66,8 +66,3 @@ $a->config['system']['rino_encrypt'] = true;
 
 $a->config['system']['theme'] = 'duepuntozero';
 
-// Addons or plugins are configured here.
-// This is a comma seperated list of addons to enable. Example:
-// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
-
-$a->config['system']['addon'] = 'js_upload';