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

Merge branch 'fabrixxm-master'

Browse Source 
Conflicts:
	boot.php
This commit is contained in:
Friendika
2011-05-23 18:17:02 -07:00
parent 3e6180183b dd32a2366c
commit 78b2db3a98
34 changed files with 475 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
index.php
View File

@@ -110,6 +110,9 @@ if(! x($_SESSION,'authenticated'))
if(! x($_SESSION,'sysmsg'))
$_SESSION['sysmsg'] = '';
if(! x($_SESSION,'sysmsg_info'))
$_SESSION['sysmsg_info'] = '';
/*
* check_config() is responsible for running update scripts. These automatically
* update the DB schema whenever we push a new one out. It also checks to see if
@@ -262,8 +265,16 @@ if(stristr($_SESSION['sysmsg'], t('Permission denied'))) {
if(x($_SESSION,'sysmsg')) {
$a->page['content'] = "<div id=\"sysmsg\" class=\"error-message\">{$_SESSION['sysmsg']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg']="";
unset($_SESSION['sysmsg']);
}
if(x($_SESSION,'sysmsg_info')) {
$a->page['content'] = "<div id=\"sysmsg_info\" class=\"info-message\">{$_SESSION['sysmsg_info']}</div>\r\n"
. ((x($a->page,'content')) ? $a->page['content'] : '');
$_SESSION['sysmsg_info']="";
unset($_SESSION['sysmsg_info']);
}
call_hooks('page_end', $a->page['content']);