Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-04-00-48-43

[civicrm-core.git] / CRM / Case / Form / Activity / ChangeCaseType.php

diff --git a/CRM/Case/Form/Activity/ChangeCaseType.php b/CRM/Case/Form/Activity/ChangeCaseType.php
index 770476b809944d8a7ca60ec7cd9f7cd81080b51d..14c10b3c2c691040deed7ee5a00160c6507f2463 100644 (file)
--- a/CRM/Case/Form/Activity/ChangeCaseType.php
+++ b/CRM/Case/Form/Activity/ChangeCaseType.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$
  *
  */
@@ -51,7 +51,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function setDefaultValues(&$form) {
     $defaults = array();
@@ -106,7 +106,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function beginPostProcess(&$form, &$params) {
     if ($form->_context == 'case') {
@@ -127,7 +127,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
    *
    * @access public
    *
-   * @return None
+   * @return void
    */
   static function endPostProcess(&$form, &$params, $activity) {
     if (!$form->_caseId) {
@@ -138,7 +138,7 @@ class CRM_Case_Form_Activity_ChangeCaseType {
     $caseTypes = CRM_Case_PseudoConstant::caseType('name');
     $allCaseTypes = CRM_Case_PseudoConstant::caseType('label', FALSE);
 
-    if (CRM_Utils_Array::value($params['case_type_id'], $caseTypes)) {
+    if (!empty($caseTypes[$params['case_type_id']])) {
       $caseType = $caseTypes[$params['case_type_id']];
     }