Changeset 566 for branches/1.1dev/config

Timestamp:

Oct 28, 2016 12:03:20 AM (8 years ago)

Author:

anonymous

Message:

Added ->error_reporting option. Updated Email->replace() to return replaced string.

File:

• branches/1.1dev/config/defaults.inc.php (modified) (6 diffs)

branches/1.1dev/config/defaults.inc.php

@@ -5 +5 @@
 
 /*
- * This file contains global configration variables that apply to the underlying 
+ * This file contains global configration variables that apply to the underlying
  * codebase framework. These values can be overwritten in a site-specific config
  * file to customize values for a specific site.
@@ -22 +22 @@
 
 // The level of error reporting. Don't set this to 0 to suppress messages, use display_errors to control display.
-error_reporting(E_ALL ^ E_NOTICE);
+setDefault($CFG->error_reporting, E_ALL & ~E_NOTICE & ~E_STRICT);
+error_reporting($CFG->error_reporting);
 
 // Location to store log files.
@@ -82 +83 @@
 setDefault($CFG->login_timeout, 21600);
 
-// The maximum amount of time a user is allowed to be idle before 
+// The maximum amount of time a user is allowed to be idle before
 // their session expires. They will be forced to login again if they expire.
 // This applies to admins and users. In seconds.
@@ -91 +92 @@
  * ACCOUNT ABUSE SETTINGS
  *****************************************************************************/
- 
+
 // The period of time to compare login abuse attempts. If a threshold of
 // logins is reached in this amount of time the account is blocked.
@@ -101 +102 @@
 $CFG->login_abuse_warnings = 3;
 
-// The maximum number of IP addresses a user can login with over the 
+// The maximum number of IP addresses a user can login with over the
 // timeout period before their account is blocked.
 $CFG->login_abuse_max_ips = 5;
 
-// The IP address subnet size threshold. Uses a CIDR notation 
+// The IP address subnet size threshold. Uses a CIDR notation
 // network mask. Any integar between 0 and 32 is permitted. Setting this
 // to '24' permits any address in a class C network (255.255.255.0)
@@ -140 +141 @@
 }
 
-// The maximum byte size that the session cache will hold. 
+// The maximum byte size that the session cache will hold.
 // Used in SessionCache.inc.php
 define('SESSION_CACHE_SIZE_BYTES', 204800); // 200 Kilobytes.