Merge branch 'fabrixxm-master'
Conflicts: boot.php
This commit is contained in:
commit
26cc2e02fe
16 changed files with 219 additions and 105 deletions
|
|
@ -182,8 +182,8 @@ function settings_post(&$a) {
|
|||
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
|
||||
$url = $_SESSION['my_url'];
|
||||
if($url && strlen(get_config('system','directory_submit_url')))
|
||||
proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
|
||||
array(),$foo));
|
||||
//proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
|
||||
proc_run($php_path,"include/directory.php","$url");
|
||||
}
|
||||
|
||||
$_SESSION['theme'] = $theme;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue