merge master

This commit is contained in:
itismadness
2017-10-20 10:58:19 +01:00
42 changed files with 706 additions and 619 deletions
+2 -5
View File
@@ -51,11 +51,8 @@ function checked($Checked) {
return ($Checked ? ' checked="checked"' : '');
}
if ($SiteOptions) {
$SiteOptions = unserialize($SiteOptions);
} else {
$SiteOptions = array();
}
$SiteOptions = (!empty($SiteOptions)) ? unserialize($SiteOptions) : array();
$SiteOptions = array_merge(Users::default_site_options(), $SiteOptions);
View::show_header("$Username > Settings", 'user,jquery-ui,release_sort,password_validate,validate,cssgallery,preview_paranoia,bbcode,user_settings,donor_titles');