From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 28 Sep 2009 04:17:00 +0000 (-0600)
Subject: Only deal with base tags when viewing inline
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3259e16f238d11b884e9092292226ee1eac65a9b;p=horde.git

Only deal with base tags when viewing inline
---

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/Html.php b/framework/Mime/lib/Horde/Mime/Viewer/Html.php
index 4151c2776..2d14177a6 100644
--- a/framework/Mime/lib/Horde/Mime/Viewer/Html.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/Html.php
@@ -105,7 +105,8 @@ class Horde_Mime_Viewer_Html extends Horde_Mime_Viewer_Driver
 
         /* Deal with <base> tags in the HTML, since they will screw up our own
          * relative paths. */
-        if (preg_match('/<base href="?([^"> ]*)"? ?\/?>/i', $data, $matches)) {
+        if (!empty($options['inline']) &&
+            preg_match('/<base href="?([^"> ]*)"? ?\/?>/i', $data, $matches)) {
             $base = $matches[1];
             if (substr($base, -1) != '/') {
                 $base .= '/';