Ian province abbreviation patch - issue 724

[civicrm-core.git] / CRM / Core / QuickForm / Action / Display.php

diff --git a/CRM/Core/QuickForm/Action/Display.php b/CRM/Core/QuickForm/Action/Display.php
index 2bb6da1149d5ff215fe68f30189d914281c764ab..3d1fb007827468c64c642da410b711e88733625d 100644 (file)
--- a/CRM/Core/QuickForm/Action/Display.php
+++ b/CRM/Core/QuickForm/Action/Display.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -29,14 +29,12 @@
  * Redefine the display action.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
- * $Id$
- *
+ * @copyright CiviCRM LLC (c) 2004-2015
  */
 class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
 
   /**
-   * The template to display the required "red" asterick
+   * The template to display the required "red" asterick.
    * @var string
    */
   static $_requiredTemplate = NULL;
@@ -67,7 +65,7 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
    * @param string $actionName
    *   Current action name, as one Action object can serve multiple actions.
    *
-   * @return void
+   * @return object|void
    */
   public function perform(&$page, $actionName) {
     $pageName = $page->getAttribute('id');
@@ -106,9 +104,6 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
    *
    * @param CRM_Core_Form $page
    *   The CRM_Core_Form page.
-   *
-   *
-   * @return void
    */
   public function renderForm(&$page) {
     $this->_setRenderTemplates($page);
@@ -191,8 +186,6 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
    *
    * @param CRM_Core_Form $page
    *   The CRM_Core_Form page.
-   *
-   * @return void
    */
   public function _setRenderTemplates(&$page) {
     if (self::$_requiredTemplate === NULL) {
@@ -207,8 +200,6 @@ class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
 
   /**
    * Initialize the various templates.
-   *
-   * @return void
    */
   public function initializeTemplates() {
     if (self::$_requiredTemplate !== NULL) {