Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-09-15-10-14-22

[civicrm-core.git] / CRM / Badge / Form / Layout.php

diff --git a/CRM/Badge/Form/Layout.php b/CRM/Badge/Form/Layout.php
index 5c9a195d88e100e764dac06fa13a34af710883f1..6f0fbaa3f51449b44bf25a4fa4e860b6a784d6bc 100644 (file)
--- a/CRM/Badge/Form/Layout.php
+++ b/CRM/Badge/Form/Layout.php
@@ -29,13 +29,10 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2015
- * $Id$
- *
  */
 
 /**
- * This class generates form components for name badge layout
- *
+ * This class generates form components for name badge layout.
  */
 class CRM_Badge_Form_Layout extends CRM_Admin_Form {
 
@@ -43,8 +40,6 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
 
   /**
    * Build the form object.
-   *
-   * @return void
    */
   public function buildQuickForm() {
     if ($this->_action & CRM_Core_Action::DELETE) {
@@ -154,11 +149,7 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
   }
 
   /**
-   * Set default values for the form. MobileProvider that in edit/view mode
-   * the default values are retrieved from the database
-   *
-   *
-   * @return void
+   * Set default values for the form.
    */
   public function setDefaultValues() {
     if (isset($this->_id)) {
@@ -183,9 +174,6 @@ class CRM_Badge_Form_Layout extends CRM_Admin_Form {
 
   /**
    * Process the form submission.
-   *
-   *
-   * @return void
    */
   public function postProcess() {
     if ($this->_action & CRM_Core_Action::DELETE) {