CRM-14716 - Change default Visibility for Mailings for Public Pages.

----------------------------------------
* CRM-14716:
  https://issues.civicrm.org/jira/browse/CRM-14716

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 4495d2d3c2f2b2e11bb6e4fc378488e12e25de7f..b425e5f0774a5406d60406d64ea07beff06df460 100644 (file)
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -1528,7 +1528,7 @@ ORDER BY   civicrm_email.is_bulkmail DESC
         'forward_replies' => FALSE,
         'open_tracking'   => TRUE,
         'url_tracking'    => TRUE,
-        'visibility'      => 'User and User Admin Only',
+        'visibility'      => 'Public Pages',
         'replyto_email'   => $domain_email,
         'header_id'       => CRM_Mailing_PseudoConstant::defaultComponent('header_id', ''),
         'footer_id'       => CRM_Mailing_PseudoConstant::defaultComponent('footer_id', ''),

diff --git a/CRM/Mailing/Form/Settings.php b/CRM/Mailing/Form/Settings.php
index 15b58f17425d8cc4cd0ba25ccd0494eabeb95da6..59825fb6c6a0501236c9a99fee5ec25dfb43e471 100644 (file)
--- a/CRM/Mailing/Form/Settings.php
+++ b/CRM/Mailing/Form/Settings.php
@@ -66,6 +66,10 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form {
    */
   function setDefaultValues() {
     $mailingID = CRM_Utils_Request::retrieve('mid', 'Integer', $this, FALSE, NULL);
+    // CRM-
+    if (!$mailingID) {
+      $mailingID = $this->get('mailing_id');
+    }
     $count = $this->get('count');
     $this->assign('count', $count);
     $defaults = array();
@@ -92,6 +96,7 @@ class CRM_Mailing_Form_Settings extends CRM_Core_Form {
       $dao->storeValues($dao, $defaults);
       $defaults['visibility'] = $dao->visibility;
     }
+    
     return $defaults;
   }
 

diff --git a/xml/schema/Mailing/Mailing.xml b/xml/schema/Mailing/Mailing.xml
index b926f1ea0603c60ba2ae2ef4e37d3b5b5f5b3927..bf2866545674d5f8d1268b070aab9dd3f38bd313 100644 (file)
--- a/xml/schema/Mailing/Mailing.xml
+++ b/xml/schema/Mailing/Mailing.xml
@@ -300,7 +300,7 @@
        <name>visibility</name>
        <type>varchar</type>
        <length>40</length>
-       <default>'User and User Admin Only'</default>
+       <default>'Public Pages'</default>
        <comment>In what context(s) is the mailing contents visible (online viewing)</comment>
        <pseudoconstant>
          <callback>CRM_Core_SelectValues::groupVisibility</callback>