Merge branch 'fabrixxm-master'
Conflicts: boot.php
This commit is contained in:
commit
78b2db3a98
34 changed files with 475 additions and 330 deletions
7
boot.php
7
boot.php
|
@ -1007,6 +1007,13 @@ function notice($s) {
|
|||
if($a->interactive)
|
||||
$_SESSION['sysmsg'] .= $s;
|
||||
}}
|
||||
if(! function_exists('info')) {
|
||||
function info($s) {
|
||||
$a = get_app();
|
||||
if($a->interactive)
|
||||
$_SESSION['sysmsg_info'] .= $s;
|
||||
}}
|
||||
|
||||
|
||||
// wrapper around config to limit the text length of an incoming message
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue