Merge pull request #3254 from jitendrapurohit/Webtest_Core_Bugs

[civicrm-core.git] / settings / Core.setting.php

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 8ac37c239a5cbc0e596703a18a2ec0ee41f44b4f..556dad263c3aea9ae9d20ec6bc03da92320ad56f 100644 (file)
--- a/settings/Core.setting.php
+++ b/settings/Core.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -205,6 +205,20 @@ return array (
     'description' => null,
     'help_text' => null,
   ),
+  'ajaxPopupsEnabled' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'ajaxPopupsEnabled',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 1,
+    'add' => '4.5',
+    'title' => null,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => null,
+    'help_text' => null,
+  ),
   'activity_assignee_notification' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
@@ -684,4 +698,20 @@ When enabled, statistics about your CiviCRM installation are reported anonymousl
     'description' => 'Prevent the stylesheet "civicrm.css" from being loaded.',
     'help_text' => NULL,
   ),
+  'empoweredBy' => array(
+    'group_name' => 'CiviCRM Preferences',
+    'group' => 'core',
+    'name' => 'empoweredBy',
+    'prefetch' => 1,
+    'config_only'=> 0,
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 1,
+    'add' => '4.5',
+    'title' => 'Display "empowered by CiviCRM"',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'When enabled, "empowered by CiviCRM" is displayed at the bottom of public forms.',
+    'help_text' => null,
+  ),
 );