Removed "Include CCs when Forwarding Messages", which had no functionality whatsoever

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12682 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 88fc5b09255b4f71e56f479daf014ad9c09ffa3b..25ec20305134c87901c65671121498a1f8f50452 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -215,6 +215,8 @@ Version 1.5.2 - SVN
     since it was not made use of and in rare cases, made sessions too big
   - Composition restoration functionality now correctly restores attachments
   - Added smtp_auth hook
     since it was not made use of and in rare cases, made sessions too big
   - Composition restoration functionality now correctly restores attachments
   - Added smtp_auth hook

+  - Removed "Include CCs when Forwarding Messages", which had no functionality
+    whatsoever.

 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 8321ab6eb93f08da8f314213cd7a537d5d2a6f67..88fb9531e0ddd60f2bce6e8706e16af02ee8e790 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -317,8 +317,6 @@ $show_only_subscribed_folders =
     getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
 
 
     getPref($data_dir, $username, 'show_only_subscribed_folders', SMPREF_ON);
 
 

-$forward_cc = getPref($data_dir, $username, 'forward_cc', SMPREF_OFF);
-

 /* How are mailbox select lists displayed: 0. full names, 1. indented (default),
  * 3. delimited) */
 $mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_MAILBOX_SELECT_INDENTED);
 /* How are mailbox select lists displayed: 0. full names, 1. indented (default),
  * 3. delimited) */
 $mailbox_select_style = getPref($data_dir, $username, 'mailbox_select_style', SMPREF_MAILBOX_SELECT_INDENTED);

diff --git a/include/options/compose.php b/include/options/compose.php
index 7b0937e4bc0cc7cbe5ee92eccc7700f569092ffc..1b6ce41914ba65711a98c0263acd7635e02e1a0d 100644 (file)
--- a/include/options/compose.php
+++ b/include/options/compose.php
@@ -107,13 +107,6 @@ function load_optpage_data_compose() {
     $optgrps[SMOPT_GRP_COMPOSE_REPLY] = _("Replying and Forwarding Messages");
     $optvals[SMOPT_GRP_COMPOSE_REPLY] = array();
 
     $optgrps[SMOPT_GRP_COMPOSE_REPLY] = _("Replying and Forwarding Messages");
     $optvals[SMOPT_GRP_COMPOSE_REPLY] = array();
 

-    $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
-        'name'    => 'forward_cc',
-        'caption' => _("Include CCs when Forwarding Messages"),
-        'type'    => SMOPT_TYPE_BOOLEAN,
-        'refresh' => SMOPT_REFRESH_NONE
-    );
-

     $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
         'name'    => 'include_self_reply_all',
         'caption' => _("Include Me in CC when I Reply All"),
     $optvals[SMOPT_GRP_COMPOSE_REPLY][] = array(
         'name'    => 'include_self_reply_all',
         'caption' => _("Include Me in CC when I Reply All"),