Changeset:
59e938d185dc
https://sourceforge.net/p/mrbs/hg-code/ci/59e938d185dcf122a5755a48dfaf0b37994e7ef2
Author:
Campbell Morrison <[email protected]>
Date:
Tue Oct 04 16:28:22 2016 +0100
Log message:
Removed second and third parameters from fatal_error()
diffstat:
web/auth/auth_ldap.inc | 3 +--
web/dbsys.inc | 2 +-
web/functions_error.inc | 4 ++--
web/mrbs_sql.inc | 2 +-
web/session/session_php.inc | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diffs (70 lines):
diff -r 8be3f6bdc49f -r 59e938d185dc web/auth/auth_ldap.inc
--- a/web/auth/auth_ldap.inc Tue Oct 04 16:18:52 2016 +0100
+++ b/web/auth/auth_ldap.inc Tue Oct 04 16:28:22 2016 +0100
@@ -99,8 +99,7 @@
if (count($value) != $count)
{
authLdapDebug("Count of LDAP array config variables doesn't match,
aborting!");
- fatal_error("MRBS configuration error: Count of LDAP array config
variables doesn't match, aborting!",
- false);
+ fatal_error("MRBS configuration error: Count of LDAP array config
variables doesn't match, aborting!");
return 0;
}
}
diff -r 8be3f6bdc49f -r 59e938d185dc web/dbsys.inc
--- a/web/dbsys.inc Tue Oct 04 16:18:52 2016 +0100
+++ b/web/dbsys.inc Tue Oct 04 16:28:22 2016 +0100
@@ -75,7 +75,7 @@
// either because they don't exist or we don't have permission.
if (!db()->table_exists($tbl_entry))
{
- fatal_error(get_vocab('fatal_no_tables'), FALSE);
+ fatal_error(get_vocab('fatal_no_tables'));
}
// Default version is 0, before we had schema versions
diff -r 8be3f6bdc49f -r 59e938d185dc web/functions_error.inc
--- a/web/functions_error.inc Tue Oct 04 16:18:52 2016 +0100
+++ b/web/functions_error.inc Tue Oct 04 16:28:22 2016 +0100
@@ -67,7 +67,7 @@
break;
}
- fatal_error($fatal_message, false, false);
+ fatal_error($fatal_message);
}
@@ -75,7 +75,7 @@
// errors without sending incomplete HTML pages. This is only used for
// errors which "should never happen", not those caused by bad inputs.
// Always outputs the bottom of the page and exits.
-function fatal_error($message, $show_form_data = true, $show_debug = true)
+function fatal_error($message)
{
print_simple_header();
echo "<p>$message</p>";
diff -r 8be3f6bdc49f -r 59e938d185dc web/mrbs_sql.inc
--- a/web/mrbs_sql.inc Tue Oct 04 16:18:52 2016 +0100
+++ b/web/mrbs_sql.inc Tue Oct 04 16:28:22 2016 +0100
@@ -646,7 +646,7 @@
// allow custom fields with spaces in them (or else have custom fields
created by MRBS).
if (strpos($key, ' ') !== FALSE)
{
- fatal_error("Custom field names cannot contain spaces.", FALSE);
+ fatal_error("Custom field names cannot contain spaces.");
}
// If the key doesn't exist in the $data array then the database will just
use its
diff -r 8be3f6bdc49f -r 59e938d185dc web/session/session_php.inc
--- a/web/session/session_php.inc Tue Oct 04 16:18:52 2016 +0100
+++ b/web/session/session_php.inc Tue Oct 04 16:28:22 2016 +0100
@@ -58,7 +58,7 @@
if (FALSE === session_start())
{
trigger_error("MRBS: could not start session", E_USER_WARNING);
- fatal_error("MRBS: server configuration error.", FALSE);
+ fatal_error("MRBS: server configuration error.");
}
// Check to see if we've been inactive for longer than allowed and if so logout
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
