Fix unit tests + update version

4 files changed, 10 insertions, 6 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 84244a5e7..e881ce230 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+RELEASE 0.4
+-----------
 - Fix disapearing upload form disapears when user selects a file on Safari (#1486823)
 - Don't replace error messages with loading info (#1486300)
 - Fix JS errors on compose mode switch (#1486870)
diff --git a/index.php b/index.php
index 6a9a748bf..3c957775e 100644
--- a/index.php
+++ b/index.php
@@ -2,9 +2,9 @@
 /*
  +-------------------------------------------------------------------------+
  | RoundCube Webmail IMAP Client                                           |
- | Version 0.3-20090814                                                    |
+ | Version 0.4-20100807                                                    |
  |                                                                         |
- | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland                   |
+ | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland                   |
  |                                                                         |
  | This program is free software; you can redistribute it and/or modify    |
  | it under the terms of the GNU General Public License version 2          |
diff --git a/program/include/iniset.php b/program/include/iniset.php
index 2a30e51c1..a4f87e95e 100755
--- a/program/include/iniset.php
+++ b/program/include/iniset.php
@@ -45,7 +45,9 @@ if (!defined('INSTALL_PATH')) {
     define('INSTALL_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');
 }
 
-define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+if (!defined('RCMAIL_CONFIG_DIR')) {
+    define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
+}
 
 // make sure path_separator is defined
 if (!defined('PATH_SEPARATOR')) {
diff --git a/tests/mailfunc.php b/tests/mailfunc.php
index 5a17d31c9..a3008a646 100644
--- a/tests/mailfunc.php
+++ b/tests/mailfunc.php
@@ -15,7 +15,7 @@ class rcube_test_mailfunc extends UnitTestCase
     // simulate environment to successfully include func.inc
     $GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
     $GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
-    $RCMAIL->action = 'spell';
+    $RCMAIL->action = 'autocomplete';
     $RCMAIL->imap_init(false);
     $IMAP = $RCMAIL->imap;
     
@@ -65,9 +65,9 @@ class rcube_test_mailfunc extends UnitTestCase
     
     $this->assertPattern('/<style [^>]+>/', $html2, "Allow styles in safe mode");
     $this->assertPattern('#src="http://evilsite.net/mailings/ex3.jpg"#', $html2, "Allow external images in HTML (safe mode)");
-    $this->assertPattern("#url\('http://evilsite.net/newsletter/image/bg/bg-64.jpg'\)#", $html2, "Allow external images in CSS (safe mode)");
+    $this->assertPattern("#url\('?http://evilsite.net/newsletter/image/bg/bg-64.jpg'?\)#", $html2, "Allow external images in CSS (safe mode)");
     
-    $css = '<link rel="stylesheet" type="text/css" href="./bin/modcss.php?u='.urlencode('http://anysite.net/styles/mail.css').'&amp;c=foo"';
+    $css = '<link rel="stylesheet" type="text/css" href="?_task=utils&amp;_action=modcss&amp;u='.urlencode('http://anysite.net/styles/mail.css').'&amp;c=foo"';
     $this->assertPattern('#'.preg_quote($css).'#', $html2, "Filter external styleseehts with bin/modcss.php");
   }