Merge in the hosted_migration_20130215 branch to the v0.3_work branch

git-svn-id: file:///svn-source/pmgr/branches/v0.3_work@1030 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
Abijah
2013-12-05 01:24:21 +00:00
parent 20284046c3
commit 98d9849914
15 changed files with 65 additions and 84 deletions

View File

@@ -5,17 +5,17 @@ class DATABASE_CONFIG {
'driver' => 'mysql',
'persistent' => false,
'host' => 'localhost',
'login' => 'pmgr',
'password' => 'pmgruser',
'database' => 'property_manager',
'prefix' => 'pmgr_',
'login' => 'perki2_pmgruser',
'password' => 'pmgrauth',
'database' => 'perki2_pmgr',
'prefix' => '',
);
function __construct() {
if (devbox())
$this->default['database'] = 'pmgr_dev';
$this->default['database'] = 'perki2_pmgr_dev';
if (sandbox())
$this->default['database'] = 'pmgr_sand';
$this->default['database'] = 'perki2_pmgr_sand';
}
}
?>