Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-08-20-42-29

[civicrm-core.git] / CRM / Price / Page / Set.php

diff --git a/CRM/Price/Page/Set.php b/CRM/Price/Page/Set.php
index c6523bb90f747d49d606005bf44b43a547409a07..199b9db755383197ecdcff88d11e1ea7ff23aef5 100644 (file)
--- a/CRM/Price/Page/Set.php
+++ b/CRM/Price/Page/Set.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$
  *
  */
@@ -201,9 +201,10 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
   /**
    * edit price set
    *
-   * @param int    $id       price set id
-   * @param string $action   the action to be invoked
+   * @param $sid
+   * @param string $action the action to be invoked
    *
+   * @internal param int $id price set id
    * @return void
    * @access public
    */
@@ -223,7 +224,9 @@ class CRM_Price_Page_Set extends CRM_Core_Page {
   /**
    * Preview price set
    *
-   * @param int $id price set id
+   * @param $sid
+   *
+   * @internal param int $id price set id
    *
    * @return void
    * @access public