From cae540ac4331beb4051129624298c38bccfbfae0 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 28 Nov 2018 17:13:17 +1300
Subject: [PATCH] Minor code cleanups.

Removes an instance where  is instantiated using the old & pattern and
fixes a non-quoted word in a template which causes notices under some configs
---
 CRM/Core/Session.php                       | 3 +--
 templates/CRM/Event/Page/UserDashboard.tpl | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Core/Session.php b/CRM/Core/Session.php
index 632a9e14ab..f618c8d3a1 100644
--- a/CRM/Core/Session.php
+++ b/CRM/Core/Session.php
@@ -114,9 +114,8 @@ class CRM_Core_Session {
         if ($isRead) {
           return;
         }
-        $config =& CRM_Core_Config::singleton();
         // FIXME: This belongs in CRM_Utils_System_*
-        if ($config->userSystem->is_drupal && function_exists('drupal_session_start')) {
+        if (CRM_Core_Config::singleton()->userSystem->is_drupal && function_exists('drupal_session_start')) {
           // https://issues.civicrm.org/jira/browse/CRM-14356
           if (!(isset($GLOBALS['lazy_session']) && $GLOBALS['lazy_session'] == TRUE)) {
             drupal_session_start();
diff --git a/templates/CRM/Event/Page/UserDashboard.tpl b/templates/CRM/Event/Page/UserDashboard.tpl
index d0a0fb6b63..8ded5d96a5 100644
--- a/templates/CRM/Event/Page/UserDashboard.tpl
+++ b/templates/CRM/Event/Page/UserDashboard.tpl
@@ -40,7 +40,7 @@
                 </tr>
                 {counter start=0 skip=1 print=false}
                 {foreach from=$event_rows item=row}
-                    <tr id='rowid{$row.participant_id}' class=" crm-event-participant-id_{$row.participant_id} {cycle values="odd-row,even-row"}{if $row.status eq Cancelled} disabled{/if}">
+                    <tr id='rowid{$row.participant_id}' class=" crm-event-participant-id_{$row.participant_id} {cycle values="odd-row,even-row"}{if $row.status eq 'Cancelled'} disabled{/if}">
                        <td class="crm-participant-event-id_{$row.event_id}"><a href="{crmURL p='civicrm/event/info' q="reset=1&id=`$row.event_id`&context=dashboard"}">{$row.event_title}</a></td>
                        <td class="crm-participant-event_start_date">
                             {$row.event_start_date|crmDate}
@@ -73,4 +73,4 @@
     {/if}
 </div>
 {crmRegion name="crm-event-userdashboard-post"}
-{/crmRegion}
\ No newline at end of file
+{/crmRegion}
-- 
2.25.1