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 2f4c1d482930678b373e6cd17cdd08a913915608..10e72d65f6343da4332e04c0c07777aa77e8a9c0 100644 (file)
--- a/CRM/Core/Config/Variables.php
+++ b/CRM/Core/Config/Variables.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
@@ -228,18 +228,6 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   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.
    */
@@ -259,6 +247,11 @@ class CRM_Core_Config_Variables extends CRM_Core_Config_Defaults {
    */
   public $userPermissionClass = 'CRM_Core_Permission_Drupal';
 
+  /**
+   * @var NULL|CRM_Core_Permission_Temp
+   */
+  public $userPermissionTemp = 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;
 
-  /**
-   * Error template to use for fatal errors
-   *
-   * @var string
-   */
-  public $fatalErrorTemplate = 'CRM/common/fatal.tpl';
-
   /**
    * Fatal error handler
    *