banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix pspell check and (yet not used MDB2 schema intialization)

Browse Source
release-0.6
thomascube 14 years ago
parent e987db1d46
commit 924b1a666e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File

14
installer/rcube_install.php
Unescape Escape View File

@ -249,9 +249,9 @@ class rcube_install
$out['dependencies'][] = array('prop' => 'spellcheck_engine', $out['dependencies'][] = array('prop' => 'spellcheck_engine',
'explain' => 'This requires the <tt>pspell</tt> extension which could not be loaded.'); 'explain' => 'This requires the <tt>pspell</tt> extension which could not be loaded.');
} }
if (!empty($this->config['spellcheck_languages'])) { else if (!empty($this->config['spellcheck_languages'])) {
foreach ($this->config['spellcheck_languages'] as $lang => $descr) foreach ($this->config['spellcheck_languages'] as $lang => $descr)
if (!pspell_new($lang)) if (!pspell_new($lang))
$out['dependencies'][] = array('prop' => 'spellcheck_languages', $out['dependencies'][] = array('prop' => 'spellcheck_languages',
'explain' => "You are missing pspell support for language $lang ($descr)"); 'explain' => "You are missing pspell support for language $lang ($descr)");
} }
@ -348,7 +348,8 @@ class rcube_install
'portability' => true 'portability' => true
); );
$schema =& MDB2_Schema::factory($this->config['db_dsnw'], $options); $dsnw = $this->config['db_dsnw'];
$schema = MDB2_Schema::factory($dsnw, $options);
$schema->db->supported['transactions'] = false; $schema->db->supported['transactions'] = false;
if (PEAR::isError($schema)) { if (PEAR::isError($schema)) {
@ -365,10 +366,11 @@ class rcube_install
} }
// load reference schema // load reference schema
$dsn = MDB2::parseDSN($this->config['db_dsnw']); $dsn_arr = MDB2::parseDSN($this->config['db_dsnw']);
$ref_schema = INSTALL_PATH . 'SQL/' . $dsn['phptype'] . '.schema.xml';
$ref_schema = INSTALL_PATH . 'SQL/' . $dsn_arr['phptype'] . '.schema.xml';
if (is_file($ref_schema)) { if (is_readable($ref_schema)) {
$reference = $schema->parseDatabaseDefinition($ref_schema, false, array(), $schema->options['fail_on_invalid_names']); $reference = $schema->parseDatabaseDefinition($ref_schema, false, array(), $schema->options['fail_on_invalid_names']);
if (PEAR::isError($reference)) { if (PEAR::isError($reference)) {

Write Preview
Loading…
Cancel
Save