Merge remote-tracking branch 'upstream/develop' into develop

[friendica.git] / view / theme / smoothly / theme.php

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 3efcf54f413a4a96c4f691f87c6a81f4964f78e7..555b65eed31c5c0509d9c256167f78b0c7d525a5 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -11,13 +11,14 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 function smoothly_init(App $a) {
-       set_template_engine($a, 'smarty3');
+       $a->set_template_engine('smarty3');
 
        $cssFile = null;
        $ssl_state = null;
-       $baseurl = App::get_baseurl($ssl_state);
+       $baseurl = System::baseUrl($ssl_state);
        $a->page['htmlhead'] .= <<< EOT
 
 <script>
@@ -33,19 +34,11 @@ function insertFormatting(BBcode, id) {
        if (document.selection) {
                textarea.focus();
                selected = document.selection.createRange();
-               if (BBcode == "url") {
-                       selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
-               } else {
-                       selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
-               }
+               selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
        } else if (textarea.selectionStart || textarea.selectionStart == "0") {
                var start = textarea.selectionStart;
                var end = textarea.selectionEnd;
-               if (BBcode == "url") {
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-               } else {
-                       textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
-               }
+               textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
        }
 
        return true;
@@ -115,7 +108,7 @@ if (! function_exists('_js_in_foot')) {
                */
                $a = get_app();
                $ssl_state = null;
-               $baseurl = App::get_baseurl($ssl_state);
+               $baseurl = System::baseUrl($ssl_state);
                $bottom['$baseurl'] = $baseurl;
                $tpl = get_markup_template('bottom.tpl');