Cherry pick a3dc37dd9f292529f550ec866ef14af28489e5aa: Change the require_once() calls...

Conflicts:

	includes/auth/auth_vbulletin.php

diff --git a/includes/auth/auth_drupal.php b/includes/auth/auth_drupal.php
index b5644bb1bbe45f5e72ade36ccb2158b4d6cabb46..e63cff0a284e2d0fb438093a7bda7fa0baaa73c2 100644 (file)
--- 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 5bfca5314da23c498160c8d54e4039d2308ae841..3c9d819bf3677029d5f3759fd063bcc6650777e1 100644 (file)
--- 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 4c2d3781e890cccd9ed955e5cedfb73bffba9d06..d4e07dee46f64d380d120c7930221b93bdcc8fef 100644 (file)
--- 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'];
        }