+--------------------------------------------------------------------+
| CiviCRM version 5 |
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018 |
+ | Copyright CiviCRM LLC (c) 2004-2019 |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
* should incorporte services for aggregation, minimization, etc.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-2018
+ * @copyright CiviCRM LLC (c) 2004-2019
* $Id$
*
*/
self::$_singleton = $instance;
}
if (self::$_singleton === NULL) {
- $sys = CRM_Extension_System::singleton();
- $cache = Civi::cache('js_strings');
- self::$_singleton = new CRM_Core_Resources(
- $sys->getMapper(),
- $cache,
- CRM_Core_Config::isUpgradeMode() ? NULL : 'resCacheCode'
- );
+ self::$_singleton = Civi::service('resources');
}
return self::$_singleton;
}
'isFrontend' => $config->userFrameworkFrontend,
),
);
+ $contactID = CRM_Core_Session::getLoggedInContactID();
+ if ($contactID) {
+ $settings['config']['menuCacheCode'] = CRM_Core_BAO_Navigation::getCacheKey($contactID);
+ }
// Disable profile creation if user lacks permission
if (!CRM_Core_Permission::check('edit all contacts') && !CRM_Core_Permission::check('add contacts')) {
$settings['config']['entityRef']['contactCreate'] = FALSE;
),
'ajaxPopupsEnabled' => self::singleton()->ajaxPopupsEnabled,
'allowAlertAutodismissal' => (bool) Civi::settings()->get('allow_alert_autodismissal'),
+ 'resourceCacheCode' => self::singleton()->getCacheCode(),
);
print CRM_Core_Smarty::singleton()->fetchWith('CRM/common/l10n.js.tpl', $vars);
CRM_Utils_System::civiExit();
) {
return TRUE;
}
- return strpos(CRM_Utils_System::getUrlPath(), 'civicrm/ajax') === 0;
+ $url = CRM_Utils_System::getUrlPath();
+ return (strpos($url, 'civicrm/ajax') === 0) || (strpos($url, 'civicrm/angular') === 0);
}
/**