From ad2a583a21c3d6ffb26c378d01983fea6a7c5857 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Thu, 19 Mar 2009 16:09:42 -0400
Subject: [PATCH] Cherry pick a3dc37dd9f292529f550ec866ef14af28489e5aa: Change
 the require_once() calls in _setupDatabase() to be include()

Conflicts:

	includes/auth/auth_vbulletin.php
---
 includes/auth/auth_drupal.php    | 2 +-
 includes/auth/auth_phpbb2.php    | 2 +-
 includes/auth/auth_vbulletin.php | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/includes/auth/auth_drupal.php b/includes/auth/auth_drupal.php
index b5644bb..e63cff0 100644
--- a/includes/auth/auth_drupal.php
+++ b/includes/auth/auth_drupal.php
@@ -52,7 +52,7 @@ class AuthenticationDrupal extends Authentication
 		parent::_setupDatabase();
 		
 		// check and see if we need to call session_name()
-		require_once 'includes/auth/config.php';
+		include 'includes/auth/config.php';
 		$this->cookieName = $config['auth']['Drupal']['cookieName'];
 		$this->cookieName = ($this->cookieName == null ? session_name() : $this->cookieName);
 	}
diff --git a/includes/auth/auth_phpbb2.php b/includes/auth/auth_phpbb2.php
index 5bfca53..3c9d819 100644
--- a/includes/auth/auth_phpbb2.php
+++ b/includes/auth/auth_phpbb2.php
@@ -61,7 +61,7 @@ class AuthenticationPhpbb2 extends Authentication
 	{
 		parent::_setupDatabase();
 		
-		require_once 'includes/auth/config.php';
+		include 'includes/auth/config.php';
 		$this->phpBBTablePrefix = $config['auth']['phpBB2']['tablePrefix'];
 		$this->cookieName = $config['auth']['phpBB2']['cookieName'];
 	}
diff --git a/includes/auth/auth_vbulletin.php b/includes/auth/auth_vbulletin.php
index 4c2d378..d4e07de 100644
--- a/includes/auth/auth_vbulletin.php
+++ b/includes/auth/auth_vbulletin.php
@@ -62,7 +62,9 @@ class AuthenticationVbulletin extends Authentication
 	// ###################################################################
 	function _setupDatabase()
 	{
-		require_once 'includes/auth/config.php';
+		parent::_setupDatabase();
+		
+		include 'includes/auth/config.php';
 		$this->licenseKey = $config['auth']['vBulletin3']['licenseKey'];
 		$this->vBTablePrefix = $config['auth']['vBulletin3']['tablePrefix'];
 	}
-- 
2.22.5