From 26b82f6e9b3c1102fbea39a42a7c1d45b784c5d1 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 23 Aug 2021 13:43:00 -0400
Subject: [PATCH] Refactor out unused/unneeded variables

---
 CRM/Contact/Page/View/Note.php | 124 +++++++++++++--------------------
 1 file changed, 50 insertions(+), 74 deletions(-)

diff --git a/CRM/Contact/Page/View/Note.php b/CRM/Contact/Page/View/Note.php
index f7ffb06e7a..be375bebb6 100644
--- a/CRM/Contact/Page/View/Note.php
+++ b/CRM/Contact/Page/View/Note.php
@@ -20,20 +20,6 @@
  */
 class CRM_Contact_Page_View_Note extends CRM_Core_Page {
 
-  /**
-   * The action links for notes that we need to display for the browse screen
-   *
-   * @var array
-   */
-  public static $_links = NULL;
-
-  /**
-   * The action links for comments that we need to display for the browse screen
-   *
-   * @var array
-   */
-  public static $_commentLinks = NULL;
-
   /**
    * Notes found running the browse function
    * @var array
@@ -242,73 +228,63 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
   /**
    * Get action links.
    *
-   * @return array
-   *   (reference) of action links
+   * @return array[]
    */
-  public static function &links() {
-    if (!(self::$_links)) {
-      $deleteExtra = ts('Are you sure you want to delete this note?');
-
-      self::$_links = [
-        CRM_Core_Action::VIEW => [
-          'name' => ts('View'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=view&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
-          'title' => ts('View Note'),
-        ],
-        CRM_Core_Action::UPDATE => [
-          'name' => ts('Edit'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=update&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
-          'title' => ts('Edit Note'),
-        ],
-        CRM_Core_Action::ADD => [
-          'name' => ts('Comment'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=add&reset=1&cid=%%cid%%&parentId=%%id%%&selectedChild=note',
-          'title' => ts('Add Comment'),
-        ],
-        CRM_Core_Action::DELETE => [
-          'name' => ts('Delete'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
-          'title' => ts('Delete Note'),
-        ],
-      ];
-    }
-    return self::$_links;
+  public static function links() {
+    return [
+      CRM_Core_Action::VIEW => [
+        'name' => ts('View'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=view&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+        'title' => ts('View Note'),
+      ],
+      CRM_Core_Action::UPDATE => [
+        'name' => ts('Edit'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=update&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+        'title' => ts('Edit Note'),
+      ],
+      CRM_Core_Action::ADD => [
+        'name' => ts('Comment'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=add&reset=1&cid=%%cid%%&parentId=%%id%%&selectedChild=note',
+        'title' => ts('Add Comment'),
+      ],
+      CRM_Core_Action::DELETE => [
+        'name' => ts('Delete'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&selectedChild=note',
+        'title' => ts('Delete Note'),
+      ],
+    ];
   }
 
   /**
    * Get action links for comments.
    *
-   * @return array
-   *   (reference) of action links
+   * @return array[]
    */
-  public static function &commentLinks() {
-    if (!(self::$_commentLinks)) {
-      self::$_commentLinks = [
-        CRM_Core_Action::VIEW => [
-          'name' => ts('View'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=view&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
-          'title' => ts('View Comment'),
-        ],
-        CRM_Core_Action::UPDATE => [
-          'name' => ts('Edit'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=update&reset=1&cid=%%cid%%&id={id}&parentId=%%pid%%&selectedChild=note',
-          'title' => ts('Edit Comment'),
-        ],
-        CRM_Core_Action::DELETE => [
-          'name' => ts('Delete'),
-          'url' => 'civicrm/contact/view/note',
-          'qs' => 'action=delete&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
-          'title' => ts('Delete Comment'),
-        ],
-      ];
-    }
-    return self::$_commentLinks;
+  public static function commentLinks() {
+    return [
+      CRM_Core_Action::VIEW => [
+        'name' => ts('View'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=view&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
+        'title' => ts('View Comment'),
+      ],
+      CRM_Core_Action::UPDATE => [
+        'name' => ts('Edit'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=update&reset=1&cid=%%cid%%&id={id}&parentId=%%pid%%&selectedChild=note',
+        'title' => ts('Edit Comment'),
+      ],
+      CRM_Core_Action::DELETE => [
+        'name' => ts('Delete'),
+        'url' => 'civicrm/contact/view/note',
+        'qs' => 'action=delete&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
+        'title' => ts('Delete Comment'),
+      ],
+    ];
   }
 
 }
-- 
2.25.1