aboutsummaryrefslogtreecommitdiffstats
path: root/mod/home.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-17 16:38:57 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-17 16:38:57 -0700
commitbe701677d67642c546de10818104f813e3e3c82a (patch)
tree531017876d7bee32f6dc6c5c5dbd3cb029120413 /mod/home.php
parent1d2797dc1fb51311e2f566ae792ee1dbb03c315c (diff)
parent1e8fc8b062d133a369c610733249dbce74df9bef (diff)
downloadvolse-hubzilla-be701677d67642c546de10818104f813e3e3c82a.tar.gz
volse-hubzilla-be701677d67642c546de10818104f813e3e3c82a.tar.bz2
volse-hubzilla-be701677d67642c546de10818104f813e3e3c82a.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: view/nl/messages.po view/nl/strings.php
Diffstat (limited to 'mod/home.php')
-rw-r--r--mod/home.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/home.php b/mod/home.php
index 242b2dcec..bf2463bbc 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -59,12 +59,14 @@ function home_content(&$a, $update = 0, $load = false) {
return $o;
}
}
+ if(strpos($frontpage,'http') !== 0)
+ $frontpage = z_root() . '/' . $frontpage;
if(intval(get_config('system','mirror_frontpage'))) {
- $o = '<html><head><title>' . t('$Projectname') . '</title></head><body style="margin: 0; padding: 0; border: none;" ><iframe src="' . z_root() . '/' . $frontpage . '" width="100%" height="100%" style="margin: 0; padding: 0; border: none;" ></iframe></body></html>';
+ $o = '<html><head><title>' . t('$Projectname') . '</title></head><body style="margin: 0; padding: 0; border: none;" ><iframe src="' . $frontpage . '" width="100%" height="100%" style="margin: 0; padding: 0; border: none;" ></iframe></body></html>';
echo $o;
killme();
}
- goaway(z_root() . '/' . $frontpage);
+ goaway($frontpage);
}