From 924b1a666ec528e07dd1f9eeb648d19514250cee Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 29 Mar 2010 12:28:14 -0400
Subject: [PATCH] Fix pspell check and (yet not used MDB2 schema intialization)
---
installer/rcube_install.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index b5724ca..b0d59fd 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -249,9 +249,9 @@
$out['dependencies'][] = array('prop' => 'spellcheck_engine',
'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)
- if (!pspell_new($lang))
+ if (!pspell_new($lang))
$out['dependencies'][] = array('prop' => 'spellcheck_languages',
'explain' => "You are missing pspell support for language $lang ($descr)");
}
@@ -348,7 +348,8 @@
'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;
if (PEAR::isError($schema)) {
@@ -365,10 +366,11 @@
}
// load reference schema
- $dsn = MDB2::parseDSN($this->config['db_dsnw']);
- $ref_schema = INSTALL_PATH . 'SQL/' . $dsn['phptype'] . '.schema.xml';
+ $dsn_arr = MDB2::parseDSN($this->config['db_dsnw']);
+
+ $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']);
if (PEAR::isError($reference)) {
--
Gitblit v1.9.1