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 #15026 from civicrm/5.17
[civicrm-core.git]
/
CRM
/
Core
/
Config.php
diff --git
a/CRM/Core/Config.php
b/CRM/Core/Config.php
index cd382e17d6f5dc7cb0822774e69080ad454a678e..4e3679fb6d4d305d38afedff0d4e7261fda28ada 100644
(file)
--- a/
CRM/Core/Config.php
+++ b/
CRM/Core/Config.php
@@
-138,7
+138,7
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
* @return object
* @see Civi::log()
*/
* @return object
* @see Civi::log()
*/
-
static publ
ic function &getLog() {
+
public stat
ic function &getLog() {
if (!isset(self::$_log)) {
self::$_log = Log::singleton('display');
}
if (!isset(self::$_log)) {
self::$_log = Log::singleton('display');
}
@@
-181,11
+181,11
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
// Whether we delete/create or simply preserve directories, we should
// certainly make sure the restrictions are enforced.
foreach ([
// Whether we delete/create or simply preserve directories, we should
// certainly make sure the restrictions are enforced.
foreach ([
-
$this->templateCompileDir,
-
$this->uploadDir,
-
$this->configAndLogDir,
-
$this->customFileUploadDir,
-
] as $dir) {
+ $this->templateCompileDir,
+ $this->uploadDir,
+ $this->configAndLogDir,
+ $this->customFileUploadDir,
+ ] as $dir) {
if ($dir && is_dir($dir)) {
CRM_Utils_File::restrictAccess($dir);
}
if ($dir && is_dir($dir)) {
CRM_Utils_File::restrictAccess($dir);
}
@@
-496,6
+496,7
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
* @return string
*/
public function defaultCurrencySymbol($defaultCurrency = NULL) {
* @return string
*/
public function defaultCurrencySymbol($defaultCurrency = NULL) {
+ CRM_Core_Error::deprecatedFunctionWarning('CRM_Core_BAO_Country::defaultCurrencySymbol');
return CRM_Core_BAO_Country::defaultCurrencySymbol($defaultCurrency);
}
return CRM_Core_BAO_Country::defaultCurrencySymbol($defaultCurrency);
}
@@
-576,7
+577,7
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
/**
* Is the system permitted to flush caches at the moment.
*/
/**
* Is the system permitted to flush caches at the moment.
*/
-
static publ
ic function isPermitCacheFlushMode() {
+
public stat
ic function isPermitCacheFlushMode() {
return !CRM_Core_Config::singleton()->doNotResetCache;
}
return !CRM_Core_Config::singleton()->doNotResetCache;
}
@@
-589,7
+590,7
@@
class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
* @param bool $enabled
* If true then caches can be cleared at this time.
*/
* @param bool $enabled
* If true then caches can be cleared at this time.
*/
-
static publ
ic function setPermitCacheFlushMode($enabled) {
+
public stat
ic function setPermitCacheFlushMode($enabled) {
CRM_Core_Config::singleton()->doNotResetCache = $enabled ? 0 : 1;
}
CRM_Core_Config::singleton()->doNotResetCache = $enabled ? 0 : 1;
}