Merge pull request #4004 from civicrm/4.4

[civicrm-core.git] / CRM / Admin / Form / PreferencesDate.php

diff --git a/CRM/Admin/Form/PreferencesDate.php b/CRM/Admin/Form/PreferencesDate.php
index 42dca3889402d47c30fc98de85b85e8b8d43ff0d..8efba4a425bcb8c9112c46f013b9aeeca9f5dee5 100644 (file)
--- a/CRM/Admin/Form/PreferencesDate.php
+++ b/CRM/Admin/Form/PreferencesDate.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$
  *
  */
@@ -42,7 +42,7 @@ class CRM_Admin_Form_PreferencesDate extends CRM_Admin_Form {
   /**
    * Function to build the form
    *
-   * @return None
+   * @return void
    * @access public
    */
   public function buildQuickForm() {
@@ -68,7 +68,7 @@ class CRM_Admin_Form_PreferencesDate extends CRM_Admin_Form {
     $this->add('text', 'start', ts('Start Offset'), $attributes['start'], TRUE);
     $this->add('text', 'end', ts('End Offset'), $attributes['end'], TRUE);
 
-    $formatType = CRM_Core_Dao::getFieldValue('CRM_Core_DAO_PreferencesDate', $this->_id, 'name');
+    $formatType = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_PreferencesDate', $this->_id, 'name');
 
     if ($formatType == 'creditCard') {
       $this->add('text', 'date_format', ts('Format'), $attributes['date_format'], TRUE);
@@ -113,7 +113,7 @@ class CRM_Admin_Form_PreferencesDate extends CRM_Admin_Form {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   public function postProcess() {
     if (!($this->_action & CRM_Core_Action::UPDATE)) {