[mms] Don't honor linked attachment limit configuration options if li…

…nked attachments are disabled (Bug #13665).
horde · Feb 25, 2015 · fdf4a24 · fdf4a24
1 parent be709c3
commit fdf4a24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/imp/docs/CHANGES b/imp/docs/CHANGES
@@ -2,6 +2,8 @@
 v6.2.8-git
 ----------
 
+[mms] Don't honor linked attachment limit configuration options if linked
+      attachments are disabled (Bug #13665).
 
 
 ------

diff --git a/imp/lib/Compose.php b/imp/lib/Compose.php
@@ -2850,6 +2850,10 @@ protected function _linkAttachments(&$body, $html)
     {
         global $conf;
 
+        if (empty($conf['compose']['link_attachments'])) {
+            return;
+        }
+
         $link_all = false;
         $linked = array();
 

diff --git a/imp/package.xml b/imp/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
  <notes>
-* 
+* [mms] Don&apos;t honor linked attachment limit configuration options if linked attachments are disabled (Bug #13665).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3828,7 +3828,7 @@
    <date>2015-02-10</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
-* 
+* [mms] Don&apos;t honor linked attachment limit configuration options if linked attachments are disabled (Bug #13665).
    </notes>
   </release>
  </changelog>