Merge pull request #15263 from JMAConsulting/financial-67

[civicrm-core.git] / CRM / Core / Block.php

diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php
index 8a9ea1f895f233e81a85e271a75d487d3754b068..a3bb87f07666ee737f74efc5c9db41c9bbeae601 100644 (file)
--- a/CRM/Core/Block.php
+++ b/CRM/Core/Block.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
  */
 
 /**
@@ -54,8 +54,9 @@ class CRM_Core_Block {
 
   /**
    * Template file names for the above blocks.
+   * @var array
    */
-  static $_properties = NULL;
+  public static $_properties = NULL;
 
   /**
    * Class constructor.
@@ -417,13 +418,20 @@ class CRM_Core_Block {
       $values[$key] = self::setShortCutValues($short);
     }
 
-    // call links hook to add user defined links
+    // Deprecated hook with typo.  Please don't use this!
     CRM_Utils_Hook::links('create.new.shorcuts',
       NULL,
       CRM_Core_DAO::$_nullObject,
       $values
     );
 
+    // Hook that enables extensions to add user-defined links
+    CRM_Utils_Hook::links('create.new.shortcuts',
+      NULL,
+      CRM_Core_DAO::$_nullObject,
+      $values
+    );
+
     foreach ($values as $key => $val) {
       if (!empty($val['title'])) {
         $values[$key]['name'] = CRM_Utils_Array::value('name', $val, $val['title']);
@@ -522,19 +530,6 @@ class CRM_Core_Block {
     self::setProperty(self::MAIL, 'templateValues', array('shortCuts' => $values));
   }
 
-  /**
-   * Create the list of shortcuts for the application and format is as a block.
-   */
-  private static function setTemplateMenuValues() {
-    $config = CRM_Core_Config::singleton();
-
-    $path = 'navigation';
-    $values = CRM_Core_Menu::getNavigation();
-    if ($values) {
-      self::setProperty(self::MENU, 'templateValues', array('menu' => $values));
-    }
-  }
-
   /**
    * Create the event blocks for upcoming events.
    */