extra slashes in header

diff --git a/boot.php b/boot.php
index 2b9b209b4dce83b607b5ac3b8cb4b6c0dad889c6..ab1505d793511464acda87e5326d9f1baf9104c4 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -380,7 +380,7 @@ class App {
                $this->page['title'] = $this->config['sitename'];
                $tpl = load_view_file('view/head.tpl');
                $this->page['htmlhead'] = replace_macros($tpl,array(
-                       '$baseurl' => $this->get_baseurl() . '/',
+                       '$baseurl' => $this->get_baseurl(),
                        '$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
                        '$delitem' => t('Delete this item?'),
                        '$comment' => t('Comment')

diff --git a/view/head.tpl b/view/head.tpl
index 1ff0ae1dff809b99fac58bb00c662dff72dfce7b..ff66997e7c4877ff9a30ac52b87fa8f1bf670c43 100644 (file)
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,5 +1,5 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
+<base href="$baseurl/" />
 <meta name="generator" content="$generator" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
 <link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />