Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-30-00-43-32

[civicrm-core.git] / tests / phpunit / WebTest / Campaign / ActivityTest.php

diff --git a/tests/phpunit/WebTest/Campaign/ActivityTest.php b/tests/phpunit/WebTest/Campaign/ActivityTest.php
index 47cc062d5e562d87da41dd01cb5e85c23c4fc14a..fe6ddf7bbb6fd4a9f793178fcd65d9887d58fc22 100644 (file)
--- a/tests/phpunit/WebTest/Campaign/ActivityTest.php
+++ b/tests/phpunit/WebTest/Campaign/ActivityTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -113,7 +113,7 @@ class WebTest_Campaign_ActivityTest extends CiviSeleniumTestCase {
 
   /**
    * @param $campaignTitle
-   * @param $id
+   * @param int $id
    */
   function activityAddTest($campaignTitle, $id) {
     // Adding Adding contact with randomized first name for test testContactContextActivityAdd