Merge branch '7.8RC'7.8

1 files changed, 14 insertions, 14 deletions

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index 8159b6d44..6fa86d9ac 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -11,16 +11,16 @@ $db_data = '{{$dbdata}}';
 $db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
 
 /*
- * Notice: Many of the following settings will be available in the admin panel 
+ * Notice: Many of the following settings will be available in the admin panel
  * after a successful site install. Once they are set in the admin panel, they
  * are stored in the DB - and the DB setting will over-ride any corresponding
  * setting in this file
  *
- * The command-line tool util/config is able to query and set the DB items 
+ * The command-line tool util/config is able to query and set the DB items
  * directly if for some reason the admin panel is not available and a system
- * setting requires modification. 
+ * setting requires modification.
  *
- */ 
+ */
 
 
 // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles".
@@ -44,8 +44,8 @@ App::$config['system']['content_security_policy'] = 1;
 App::$config['system']['ssl_cookie_protection'] = 1;
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
-// Be certain to create your own personal account before setting 
-// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on 
+// Be certain to create your own personal account before setting
+// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on
 // the registration page. REGISTER_APPROVE requires you set 'admin_email'
 // to the email address of an already registered person who can authorise
 // and/or approve/deny the request.
@@ -54,7 +54,7 @@ App::$config['system']['register_policy'] = REGISTER_OPEN;
 App::$config['system']['register_text'] = '';
 App::$config['system']['admin_email'] = '{{$adminmail}}';
 
-// Recommend you leave this set to 1. Set to 0 to let people register without 
+// Recommend you leave this set to 1. Set to 0 to let people register without
 // proving they own the email address they register with.
 
 App::$config['system']['verify_email'] = 1;
@@ -64,10 +64,10 @@ App::$config['system']['verify_email'] = 1;
 // Your choices are ACCESS_PRIVATE, ACCESS_PAID, ACCESS_TIERED, and ACCESS_FREE.
 // If you leave REGISTER_OPEN above, anybody may register on your
 // site, however your site will not be listed anywhere as an open
-// registration  hub. We will use the system access policy (below) 
-// to determine whether or not to list your site in the directory 
-// as an open hub where anybody may create accounts. Your choice of 
-// paid, tiered, or free determines how these listings will be presented.  
+// registration  hub. We will use the system access policy (below)
+// to determine whether or not to list your site in the directory
+// as an open hub where anybody may create accounts. Your choice of
+// paid, tiered, or free determines how these listings will be presented.
 
 
 App::$config['system']['access_policy'] = ACCESS_PRIVATE;
@@ -105,7 +105,7 @@ App::$config['system']['theme'] = 'redbasic';
 // or change the name (below) to a file/path where this is allowed.
 
 // Uncomment the following 4 lines to turn on PHP error logging.
-//error_reporting(E_ERROR | E_WARNING | E_PARSE ); 
-//ini_set('error_log','php.out'); 
-//ini_set('log_errors','1'); 
+//error_reporting(E_ALL & ~E_WARNING & ~E_PARSE & ~E_NOTICE & ~E_DEPRECATED);
+//ini_set('error_log','php.out');
+//ini_set('log_errors','1');
 //ini_set('display_errors', '0');