Merge branch 'master' into notify

9 files changed, 4 insertions, 39 deletions

diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index dca34f482..87ded77fd 100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -1,4 +1,4 @@
-<?php
+<?php
 
 // Nastavte následující pro Vaši instalaci MySQL
 // Zkopírujte nebo přejmenujte tento soubor na .htconfig.php
@@ -70,9 +70,4 @@ $a->config['system']['rino_encrypt'] = true;
 
 $a->config['system']['theme'] = 'duepuntozero';
 
-// Addony or pluginy se nastavují zde.
-// Toto je list čárkou oddělených addonů, které jsou povoleny. Příklad:
-// $a->config['system']['addon'] = 'js_upload,randplace,oembed';
-
-$a->config['system']['addon'] = 'js_upload';
 
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 6eb950130..c535cefa6 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -66,9 +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';
-
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 6eb950130..c535cefa6 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -66,9 +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';
-
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index ea8439ebb..9f6e282ab 100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -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';
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index 13ddab07f..c535cefa6 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -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';
diff --git a/view/head.tpl b/view/head.tpl
index 055c3cef5..9fe5a63b3 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -28,6 +28,8 @@
 <script type="text/javascript" src="$baseurl/js/main.js" ></script>
 <script>
 
+	var updateInterval = $update_interval;
+
 	function confirmDelete() { return confirm("$delitem"); }
 	function commentOpen(obj,id) {
 		if(obj.value == '$comment') {
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index ea8439ebb..9f6e282ab 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -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';
diff --git a/view/settings.tpl b/view/settings.tpl
index 3b10943f3..e15976581 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -29,6 +29,7 @@ $nickname_block
 {{inc field_input.tpl with $field=$defloc }}{{endinc}}
 {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 {{inc field_select.tpl with $field=$theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 6eb950130..c535cefa6 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -66,9 +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';
-