projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 06fad111558c87df077fd2c702fe598101a9d67d..3d1fb007827468c64c642da410b711e88733625d 100644
(file)
--- a/
CRM/Core/QuickForm/Action/Display.php
+++ b/
CRM/Core/QuickForm/Action/Display.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
6
|
+ | CiviCRM version 4.
7
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-29,9
+29,7
@@
* Redefine the display action.
*
* @package CRM
* 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 {
*/
class CRM_Core_QuickForm_Action_Display extends CRM_Core_QuickForm_Action {
@@
-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.
*
* @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');
*/
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.
*
* @param CRM_Core_Form $page
* The CRM_Core_Form page.
- *
- *
- * @return void
*/
public function renderForm(&$page) {
$this->_setRenderTemplates($page);
*/
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.
*
* @param CRM_Core_Form $page
* The CRM_Core_Form page.
- *
- * @return void
*/
public function _setRenderTemplates(&$page) {
if (self::$_requiredTemplate === NULL) {
*/
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.
/**
* Initialize the various templates.
- *
- * @return void
*/
public function initializeTemplates() {
if (self::$_requiredTemplate !== NULL) {
*/
public function initializeTemplates() {
if (self::$_requiredTemplate !== NULL) {