fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-01 16:22:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into pr/advanced-mailer

Browse source
This commit is contained in:
Kijin Sung 2016-05-15 20:22:55 +09:00
commit 1f39a51c66
48 changed files with 466 additions and 603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/framework/drivers/cache/redis.php vendored
View file

@ -29,12 +29,13 @@ class Redis implements \Rhymix\Framework\Drivers\CacheInterface
{
try
{
$this->_conn = new \Redis;
$this->_conn = null;
foreach ($config as $url)
{
$info = parse_url($url);
if (isset($info['host']) && isset($info['port']))
{
$this->_conn = new \Redis;
$this->_conn->connect($info['host'], $info['port'], 0.15);
if(isset($info['user']) || isset($info['pass']))
{
@ -47,7 +48,6 @@ class Redis implements \Rhymix\Framework\Drivers\CacheInterface
break;
}
}
$this->_conn = null;
}
catch (\RedisException $e)
{

2
common/framework/parsers/configparser.php
View file

@ -242,7 +242,7 @@ class ConfigParser
}
// Convert miscellaneous configuration.
$config['use_mobile_view'] = $db_info->use_mobile_view === 'N' ? false : true;
$config['mobile']['enabled'] = $db_info->use_mobile_view === 'N' ? false : true;
$config['use_prepared_statements'] = $db_info->use_prepared_statements === 'Y' ? true : false;
$config['use_rewrite'] = $db_info->use_rewrite === 'Y' ? true : false;
$config['use_sso'] = $db_info->use_sso === 'Y' ? true : false;