From 04eba95a5f2977f2296f8de5019bf320b2b57bbc Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Thu, 30 Oct 2014 17:33:26 -0700
Subject: [PATCH] CRM-15197 - Fix date formatting in PCP page tpl (should use
 crmDate). Corresponding webtest fix as well.

----------------------------------------
* CRM-15197:
  https://issues.civicrm.org/jira/browse/CRM-15197
---
 templates/CRM/PCP/Page/PCP.tpl             | 4 ++--
 tests/phpunit/WebTest/Event/PCPAddTest.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/CRM/PCP/Page/PCP.tpl b/templates/CRM/PCP/Page/PCP.tpl
index 2d1d07239f..6c11d3a2d9 100644
--- a/templates/CRM/PCP/Page/PCP.tpl
+++ b/templates/CRM/PCP/Page/PCP.tpl
@@ -57,8 +57,8 @@
     <td><a href="{crmURL p='civicrm/pcp/info' q="reset=1&id=`$row.id`" fe='true'}" title="{ts}View Personal Campaign Page{/ts}" target="_blank">{$row.title}</a></td>
     <td><a href="{crmURL p='civicrm/contact/view' q="reset=1&cid=`$row.supporter_id`"}" title="{ts}View contact record{/ts}">{$row.supporter}</a></td>
     <td><a href="{$row.page_url}" title="{ts}View page{/ts}" target="_blank">{$row.page_title}</td>
-    <td>{$row.start_date|crmDate:"%b %d, %Y %l:%M %P"}</td>
-    <td>{if $row.end_date}{$row.end_date|crmDate:"%b %d, %Y %l:%M %P"}{else}({ts}ongoing{/ts}){/if}</td>
+    <td>{$row.start_date|crmDate}</td>
+    <td>{if $row.end_date}{$row.end_date|crmDate}{else}({ts}ongoing{/ts}){/if}</td>
     <td>{$row.status_id}</td>
     <td id={$row.id}>{$row.action|replace:'xx':$row.id}</td>
   </tr>
diff --git a/tests/phpunit/WebTest/Event/PCPAddTest.php b/tests/phpunit/WebTest/Event/PCPAddTest.php
index 1a96a1a4cc..5a72d15213 100644
--- a/tests/phpunit/WebTest/Event/PCPAddTest.php
+++ b/tests/phpunit/WebTest/Event/PCPAddTest.php
@@ -493,8 +493,7 @@ class WebTest_Event_PCPAddTest extends CiviSeleniumTestCase {
     $this->clickLink("_qf_Search_refresh");
 
     $this->clickLink("xpath=//div[@id='participantSearch']/table/tbody/tr[1]/td[@class='crm-participant-sort_name']/a[text()='{$sortName}']/../../td[11]/span/a[text()='View']", "xpath=//table[@class='selector row-highlight']/tbody/tr/td[8]/span/a[text()='View']", FALSE);
-    $this->click("xpath=//table[@class='selector row-highlight']/tbody/tr/td[8]/span/a[text()='View']");
-    $this->waitForElementPresent('_qf_ContributionView_cancel-bottom');
+    $this->clickLink("xpath=//table[@class='selector row-highlight']/tbody/tr[1]/td[8]/span/a[text()='View']", "_qf_ParticipantView_cancel-bottom", false);
 
     $this->webtestVerifyTabularData(
       array(
-- 
2.25.1