kashire/lainchan
4
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Don't overwrite configs when loading

Browse Source
This commit is contained in:
Savetheinternet 2011-02-16 16:24:23 +11:00
parent defe48be8e
commit f8e7c0ceb9
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inc/functions.php
View File

@ -9,8 +9,10 @@
require 'instance-config.php'; require 'instance-config.php';
} }
if(!isset($config['post_url']))
$config['post_url'] = $config['root'] . $config['file_post']; $config['post_url'] = $config['root'] . $config['file_post'];
if(!isset($config['url_match']))
$config['url_match'] = '/^' . $config['url_match'] = '/^' .
(preg_match($config['url_regex'], $config['root']) ? '' : (preg_match($config['url_regex'], $config['root']) ? '' :
(@$_SERVER['HTTPS']?'https':'http') . (@$_SERVER['HTTPS']?'https':'http') .
@ -29,11 +31,16 @@
'\?\/.+' . '\?\/.+' .
')$/i'; ')$/i';
if(!isset($config['dir']['static']))
$config['dir']['static'] = $config['root'] . 'static/'; $config['dir']['static'] = $config['root'] . 'static/';
if(!isset($config['image_sticky']))
$config['image_sticky'] = $config['dir']['static'] . 'sticky.gif'; $config['image_sticky'] = $config['dir']['static'] . 'sticky.gif';
if(!isset($config['image_locked']))
$config['image_locked'] = $config['dir']['static'] . 'locked.gif'; $config['image_locked'] = $config['dir']['static'] . 'locked.gif';
if(!isset($config['image_deleted']))
$config['image_deleted'] = $config['dir']['static'] . 'deleted.png'; $config['image_deleted'] = $config['dir']['static'] . 'deleted.png';
if(!isset($config['image_zip']))
$config['image_zip'] = $config['dir']['static'] . 'zip.png'; $config['image_zip'] = $config['dir']['static'] . 'zip.png';
} }