harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	view/nl/messages.po
	view/nl/strings.php
This commit is contained in:
redmatrix 2015-10-17 16:38:57 -07:00
commit be701677d6
5 changed files with 8783 additions and 17705 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/home.php
View File

@ -59,12 +59,14 @@ function home_content(&$a, $update = 0, $load = false) {
return $o; return $o;
} }
} }
if(strpos($frontpage,'http') !== 0)
$frontpage = z_root() . '/' . $frontpage;
if(intval(get_config('system','mirror_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; echo $o;
killme(); killme();
} }
goaway(z_root() . '/' . $frontpage); goaway($frontpage);
} }

8996
util/messages.po
View File

File diff suppressed because it is too large Load Diff

2
version.inc
View File

@ -1 +1 @@
2015-10-15.1186 2015-10-17.1188

14406
view/nl/messages.po
View File

File diff suppressed because it is too large Load Diff

3078
view/nl/strings.php
View File

File diff suppressed because it is too large Load Diff