Changeset 3442 in subversion

Timestamp:

Mar 29, 2010 12:28:14 PM (3 years ago)

Author:

thomasb

Message:

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

File:

• trunk/roundcubemail/installer/rcube_install.php (modified) (3 diffs)

trunk/roundcubemail/installer/rcube_install.php

@@ -250 +250 @@
           '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)");
@@ -349 +349 @@
     );
     
-    $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;
     
@@ -366 +367 @@
       
       // 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']);