|
|
@ -35,15 +35,8 @@ class rcube_sql_password
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if ($dsn = $rcmail->config->get('password_db_dsn')) {
|
|
|
|
if ($dsn = $rcmail->config->get('password_db_dsn')) {
|
|
|
|
// #1486067: enable new_link option
|
|
|
|
|
|
|
|
if (is_array($dsn) && empty($dsn['new_link']))
|
|
|
|
|
|
|
|
$dsn['new_link'] = true;
|
|
|
|
|
|
|
|
else if (!is_array($dsn) && !preg_match('/\?new_link=true/', $dsn))
|
|
|
|
|
|
|
|
$dsn .= '?new_link=true';
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
$db = rcube_db::factory($dsn, '', false);
|
|
|
|
$db = rcube_db::factory($dsn, '', false);
|
|
|
|
$db->set_debug((bool)$rcmail->config->get('sql_debug'));
|
|
|
|
$db->set_debug((bool)$rcmail->config->get('sql_debug'));
|
|
|
|
$db->db_connect('w');
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
$db = $rcmail->get_dbh();
|
|
|
|
$db = $rcmail->get_dbh();
|
|
|
|