Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
  roll protocol version due to ssl_policy settings
  force login to ssl on SSL_POLICY_SELFSIGN
  basic ssl_policy for important modules
  ssl_policy stuff
  revup
  splitted tests into several files
  removed done TODO
  get_tags tests corrected. They test for the right things now.
  addon settings form error
  more work on filer, comment level and file tag removal
  added slack-NS, non-scrolly, slackr-based theme.
  get tags test improved
  splitted test cases.
  changed a test string
  added some tests
  added library and include to .htaccess
  excludes reports from git
  better tests
  added test blueprints, fixed? encoding issues

* master:

1 files changed, 1 insertions, 1 deletions

diff --git a/util/db_update.php b/util/db_update.php
index a6177324a..35620e80b 100755
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -26,7 +26,7 @@ echo "New DB VERSION: " . DB_UPDATE_VERSION . "\n";
 
 if($build != DB_UPDATE_VERSION) {
 	echo "Updating database...";
-	check_config();
+	check_config($a);
 	echo "Done\n";
 }