Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-12-26 c942e4a2e9a97743850b4178ea66b3b33956e7f7

 tests/MailFunc.php

@@ -173,7 +173,7 @@
    function test_resolve_base()
    {
        $html = file_get_contents(TESTS_DIR . 'src/htmlbase.txt');
        $html = rcmail_resolve_base($html);
        $html = rcube_washtml::resolve_base($html);

        $this->assertRegExp('|src="http://alec\.pl/dir/img1\.gif"|', $html, "URI base resolving [1]");
        $this->assertRegExp('|src="http://alec\.pl/dir/img2\.gif"|', $html, "URI base resolving [2]");