Merge branch 'rcsheets-docstring-cleanup'

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

diff --git a/settings/Core.setting.php b/settings/Core.setting.php
index 680560aded64aaa269d445398d0daa036e32a279..56d80e9f15924497565f70d6268a6017804427d0 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,10 +205,10 @@ return array (
     'description' => null,
     'help_text' => null,
   ),
-  'ajax_popups_enabled' => array(
+  'ajaxPopupsEnabled' => array(
     'group_name' => 'CiviCRM Preferences',
     'group' => 'core',
-    'name' => 'ajax_popups_enabled',
+    'name' => 'ajaxPopupsEnabled',
     'type' => 'Boolean',
     'quick_form_type' => 'YesNo',
     'default' => 1,