From: Tim Otten <totten@civicrm.org>
Date: Sat, 12 Sep 2015 06:34:49 +0000 (-0700)
Subject: Cleanup `config_only` settings (maxFileSize, doNotAttachPDFReceipt, resCacheCode)
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6aa291b34d067dc4f65ead276b9eba5a66ceadb0;p=civicrm-core.git

Cleanup `config_only` settings (maxFileSize, doNotAttachPDFReceipt, resCacheCode)
---

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 966b7945ea..6cbf8e2b35 100644
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -307,8 +307,6 @@ return array(
     'name' => 'maxFileSize',
     'prefetch' => 1,
     // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'Integer',
     'quick_form_type' => 'Element',
     'html_type' => 'text',
@@ -416,8 +414,6 @@ return array(
     'name' => 'doNotAttachPDFReceipt',
     'prefetch' => 1,
     // prefetch causes it to be cached in config object. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,
@@ -596,10 +592,6 @@ return array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
     'name' => 'resCacheCode',
-    'prefetch' => 1,
-    // prefetch causes it to be cached in config settings. Usually this is a transitional setting. Some things like urls are permanent. Remove this comment if you have assessed & it should be permanent
-    'config_only' => 1,
-    //@todo - see https://wiki.civicrm.org/confluence/display/CRMDOC/Settings+Reference#SettingsReference-Convertingaconfigobjecttoasetting on removing this deprecated value
     'type' => 'String',
     'quick_form_type' => 'Element',
     'html_attributes' => array(