projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3119 from pradpnayak/CRM-14380
[civicrm-core.git]
/
CRM
/
Core
/
Smarty.php
diff --git
a/CRM/Core/Smarty.php
b/CRM/Core/Smarty.php
index 6422ca2c489ac59884a160adcaaff16ae972e333..0e55b1fa27b828373aafb690127fa537acb0bcb1 100644
(file)
--- a/
CRM/Core/Smarty.php
+++ b/
CRM/Core/Smarty.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-59,8
+59,10
@@
class CRM_Core_Smarty extends Smarty {
// this prints a complete form and also generates a qfKey, can we replace this with
// snippet = 2?? Does the constant _NOFFORM do anything?
PRINT_QFKEY = 5,
// this prints a complete form and also generates a qfKey, can we replace this with
// snippet = 2?? Does the constant _NOFFORM do anything?
PRINT_QFKEY = 5,
- // this sends the output back in json
- PRINT_JSON = 6;
+ // Note: added in v 4.3 with the value '6'
+ // Value changed in 4.5 to 'json' for better readability
+ // @see CRM_Core_Page_AJAX::returnJsonResponse
+ PRINT_JSON = 'json';
/**
* We only need one instance of this object. So we use the singleton
/**
* We only need one instance of this object. So we use the singleton
@@
-160,6
+162,8
@@
class CRM_Core_Smarty extends Smarty {
$this->register_function('crmURL', array('CRM_Utils_System', 'crmURL'));
$this->load_filter('pre', 'resetExtScope');
$this->register_function('crmURL', array('CRM_Utils_System', 'crmURL'));
$this->load_filter('pre', 'resetExtScope');
+
+ $this->assign('crmPermissions', new CRM_Core_Smarty_Permissions());
}
/**
}
/**