Merge branch 'master' into Development
This commit is contained in:
commit
fbd215e741
1
init.php
1
init.php
@ -96,6 +96,7 @@ $result = ORM::for_table('tbl_appconfig')->find_many();
|
|||||||
foreach ($result as $value) {
|
foreach ($result as $value) {
|
||||||
$config[$value['setting']] = $value['value'];
|
$config[$value['setting']] = $value['value'];
|
||||||
}
|
}
|
||||||
|
$_c = $config;
|
||||||
if (empty($http_proxy) && !empty($config['http_proxy'])) {
|
if (empty($http_proxy) && !empty($config['http_proxy'])) {
|
||||||
$http_proxy = $config['http_proxy'];
|
$http_proxy = $config['http_proxy'];
|
||||||
if (empty($http_proxyauth) && !empty($config['http_proxyauth'])) {
|
if (empty($http_proxyauth) && !empty($config['http_proxyauth'])) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user