projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-16373 - Config - Remove `gettextCodeset` and `gettextDomain`
[civicrm-core.git]
/
CRM
/
Core
/
Config
/
Variables.php
diff --git
a/CRM/Core/Config/Variables.php
b/CRM/Core/Config/Variables.php
index 9e50bf0c69a343e2674c021070b5c1ee861be55f..10e72d65f6343da4332e04c0c07777aa77e8a9c0 100644
(file)
--- a/
CRM/Core/Config/Variables.php
+++ b/
CRM/Core/Config/Variables.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
6
|
+ | CiviCRM version 4.
7
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
4
|
+ | Copyright CiviCRM LLC (c) 2004-201
5
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-31,28
+31,28
@@
* it need to be defined here first.
*
* @package CRM
* it need to be defined here first.
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
4
+ * @copyright CiviCRM LLC (c) 2004-201
5
* $Id$
*
*/
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
/**
* $Id$
*
*/
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
/**
- * The debug level for civicrm
+ * The debug level for civicrm
.
* @var int
*/
public $debug = 0;
public $backtrace = 0;
/**
* @var int
*/
public $debug = 0;
public $backtrace = 0;
/**
- * The directory where Smarty and plugins are installed
+ * The directory where Smarty and plugins are installed
.
* @var string
*/
public $smartyDir = NULL;
public $pluginsDir = NULL;
/**
* @var string
*/
public $smartyDir = NULL;
public $pluginsDir = NULL;
/**
- * The root directory of our template tree
+ * The root directory of our template tree
.
* @var string
*/
public $templateDir = NULL;
* @var string
*/
public $templateDir = NULL;
@@
-228,18
+228,6
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
*/
public $monetaryThousandSeparator = ',';
*/
public $monetaryThousandSeparator = ',';
- /**
- * Default encoding of strings returned by gettext
- * @var string
- */
- public $gettextCodeset = 'utf-8';
-
- /**
- * Default name for gettext domain.
- * @var string
- */
- public $gettextDomain = 'civicrm';
-
/**
* Default location of gettext resource files.
*/
/**
* Default location of gettext resource files.
*/
@@
-259,6
+247,11
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
*/
public $userPermissionClass = 'CRM_Core_Permission_Drupal';
*/
public $userPermissionClass = 'CRM_Core_Permission_Drupal';
+ /**
+ * @var NULL|CRM_Core_Permission_Temp
+ */
+ public $userPermissionTemp = NULL;
+
public $userFrameworkURLVar = 'q';
public $userFrameworkDSN = NULL;
public $userFrameworkBaseURL = NULL;
public $userFrameworkURLVar = 'q';
public $userFrameworkDSN = NULL;
public $userFrameworkBaseURL = NULL;
@@
-358,13
+351,6
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
*/
public $enableSSL = FALSE;
*/
public $enableSSL = FALSE;
- /**
- * Error template to use for fatal errors
- *
- * @var string
- */
- public $fatalErrorTemplate = 'CRM/common/fatal.tpl';
-
/**
* Fatal error handler
*
/**
* Fatal error handler
*
@@
-474,7
+460,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
public $wpBasePage = NULL;
/**
public $wpBasePage = NULL;
/**
- * Provide addressSequence
+ * Provide addressSequence
.
*
* @param
*
*
* @param
*
@@
-489,7
+475,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
}
/**
}
/**
- * Provide cached default currency symbol
+ * Provide cached default currency symbol
.
*
* @param
*
*
* @param
*
@@
-514,7
+500,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
}
/**
}
/**
- * Provide cached default currency symbol
+ * Provide cached default currency symbol
.
*
* @param
*
*
* @param
*
@@
-535,7
+521,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
}
/**
}
/**
- * Provide cached default country name
+ * Provide cached default country name
.
*
* @param
*
*
* @param
*
@@
-551,7
+537,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
}
/**
}
/**
- * Provide cached country limit translated to names
+ * Provide cached country limit translated to names
.
*
* @param
*
*
* @param
*
@@
-581,7
+567,7
@@
class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
}
/**
}
/**
- * Provide cached province limit translated to names
+ * Provide cached province limit translated to names
.
*
* @param
*
*
* @param
*