Merge remote-tracking branch 'upstream/master'
Conflicts: boot.php database.sql library/fancybox/jquery.fancybox-1.3.4.css mod/search.php update.php
This commit is contained in:
commit
93143702ed
831 changed files with 37929 additions and 30644 deletions
|
@ -58,9 +58,9 @@ if(!$install) {
|
|||
require_once("include/session.php");
|
||||
load_hooks();
|
||||
call_hooks('init_1');
|
||||
}
|
||||
|
||||
$maintenance = get_config('system', 'maintenance');
|
||||
$maintenance = get_config('system', 'maintenance');
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
|
@ -141,7 +141,8 @@ if($install)
|
|||
elseif($maintenance)
|
||||
$a->module = 'maintenance';
|
||||
else {
|
||||
proc_run('php', 'include/dbupdate.php');
|
||||
check_url($a);
|
||||
check_db();
|
||||
check_plugins($a);
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue