Changeset:
19b6162331e1
https://sourceforge.net/p/mrbs/hg-code/ci/19b6162331e16e752f77ab306d51060ff17a07c8
Author:
John Beranek <[email protected]>
Date:
Fri Sep 18 20:25:05 2015 +0100
Log message:
Backed out changeset cd0f45f42fd9
diffstat:
web/config.inc.php | 11 ++---------
web/internalconfig.inc.php | 2 +-
2 files changed, 3 insertions(+), 10 deletions(-)
diffs (44 lines):
diff -r cd0f45f42fd9 -r 19b6162331e1 web/config.inc.php
--- a/web/config.inc.php Fri Sep 18 20:23:07 2015 +0100
+++ b/web/config.inc.php Fri Sep 18 20:25:05 2015 +0100
@@ -33,7 +33,7 @@
//
// A list of valid timezones can be found at
http://php.net/manual/timezones.php
// The following line must be uncommented by removing the '//' at the beginning
-$timezone = "Europe/London";
+//$timezone = "Europe/London";
/*******************
@@ -42,8 +42,6 @@
// Which database system: "pgsql"=PostgreSQL, "mysql"=MySQL,
// "mysqli"=MySQL via the mysqli PHP extension
$dbsys = "mysqli";
-#$dbsys = "pgsql";
-
// Hostname of database server. For pgsql, can use "" instead of localhost
// to use Unix Domain Sockets instead of TCP/IP. For mysql/mysqli "localhost"
// tells the system to use Unix Domain Sockets, and $db_port will be ignored;
@@ -73,9 +71,4 @@
to change the default configuration. Do _NOT_ modify systemdefaults.inc.php
or areadefaults.inc.php. */
-$auth['type'] = 'db';
-#$auth['type'] = 'ldap';
-$ldap_host = "localhost";
-$ldap_user_attrib = "cn";
-$ldap_debug = true;
-$ldap_base_dn = 'dc=theberaneks,dc=org,dc=uk';
+
diff -r cd0f45f42fd9 -r 19b6162331e1 web/internalconfig.inc.php
--- a/web/internalconfig.inc.php Fri Sep 18 20:23:07 2015 +0100
+++ b/web/internalconfig.inc.php Fri Sep 18 20:25:05 2015 +0100
@@ -127,7 +127,7 @@
********************************************************/
// Check PHP version
-$min_PHP_version = '5.3.3';
+$min_PHP_version = '5.3.0';
if (!function_exists('version_compare') || version_compare(PHP_VERSION,
$min_PHP_version) < 0)
{
die("MRBS requires PHP $min_PHP_version or above. This server is running
version " . PHP_VERSION . ".");
------------------------------------------------------------------------------
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
