From 35b21c31a54bfac28f02fd44bc0a6cd45c591674 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 29 May 2012 14:52:27 -0400
Subject: [PATCH] Adjust autoloader

---
 autoload.php                  |  15 +++++----------
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/autoload.php b/autoload.php
index 6099aa4..3f2c570 100644
--- a/autoload.php
+++ b/autoload.php
@@ -50,15 +50,16 @@ if ( ! function_exists('do_include'))
 function query_autoload($class)
 {
 	$class = strtolower($class);
-	
+
 	// Load Firebird separately
-	if ($class === 'firebird')
+	if (function_exists('fbird_connect') && $class === 'firebird')
 	{
+		array_map('do_include', glob(QDRIVER_PATH.'/firebird/*.php'));
 		return;
 	}
-	
+
 	$class_path = QBASE_PATH . "classes/{$class}.php";
-	
+
 	$driver_path = QDRIVER_PATH . "{$class}";
 
 	if (is_file($class_path))
@@ -77,12 +78,6 @@ function query_autoload($class)
 // Set up autoloader
 spl_autoload_register('query_autoload');
 
-// Load Firebird driver, if applicable
-if (function_exists('fbird_connect'))
-{
-	array_map('do_include', glob(QDRIVER_PATH.'/firebird/*.php'));
-}
-
 // --------------------------------------------------------------------------
 
 /**
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index fc75b052bdaaa2787780cc1e648cfed8e4893119..6d4b150d6c4f1a746eb3aaef91b35dc382ac994a 100644
GIT binary patch
delta 396
zcmYLFJxc>Y5S_idy-RKg88ImYkzCH0V3kxNSoqOvBWjlv`X6kRQ)DZ}Ca{QY1WQp#
z4!;UZQM9&-!bM3DBiQTSCBe7MJRZDx%#P=kJg>CKV7jQg@DD;y@2ik~2jE&2fX0qr
z0hXtp^VyM}fk0EQ5(%cd?_4;Q^W-iGVuCb5x*$Uk7i0>u1jPi!>tq|mZW=seZ^arr
z1$)~PMY~=^<E&hb_i_h)g$+ZB=V0B;K+P(^nw5i8ECaJ<7HVb!MokxfcmW<Q7ph8o
zieI=3r)p+T=@4Bj3kFZX44;sP9ZWYio49Wbh2Of13=E>xWjeqm=F5!$7Ze>e(UA`U
zPGacnL;eOh$F5}Q4aa1;g*j&sqpJ`G6kRKf)gld=FHc%{EAQJl&o1S`7mmxP4(4U|
P18v!USL-A{@q6_Tcx+bO

delta 383
zcmYL^Jxc>Y5Qb+jm%G~=g5yWPAV@Cp%yr3uAlhmd&?cx|(pdNpEDRh9Yolnlhc+Tw
zD;hi-tx^j1R*8_rB1Hc|+$08Pn0fb^-5GX*zz+g{gTYFnpMifP3}SyY(3%4fsQ}Q}
z<p)4%`90^PMh^%y<&_~Ym21wUQ+b#;BtcA&CMYII7Zev{2r>m(g7_2JI<e;{p0=x2
zbmZAp^SGb4qkbOa_vLdwnmo>1Y#Qo@3l?|bif5q2J(#i5Q0Hm*F%?@0IN(`$GqZ4G
zdJrgGSG9tw?U*hssq?^UMgqFVqCD$iGTLw8i9Q*srCx`Z3<jSMWwM2vER?$~TvM{w
z#iEkaZ(NY6Hs;ucY<}XrEVt2h#?3L+%79?Z+K@pD<!u{Z<aGn*WVM4n19{iMqFim_
KY&7+Sz3pGFbyP9{