diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-30 13:57:26 +0200 |
| commit | fd2ceab417bbb696134910ce0eaeca34bea3e1e5 (patch) | |
| tree | 0eeb742a553a36bf2375793661ff3e7925f792a6 /tests/mocks/autoloader.php | |
| parent | 6763522d29416b7db90a6d3c5dceffe1536d8efe (diff) | |
| parent | 11fd4b8759438f216318e3e1e004f918b88a56ad (diff) | |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into email
Diffstat (limited to 'tests/mocks/autoloader.php')
| -rw-r--r-- | tests/mocks/autoloader.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php index 92c9bea59..441c88944 100644 --- a/tests/mocks/autoloader.php +++ b/tests/mocks/autoloader.php @@ -22,7 +22,7 @@ function autoload($class) ); $ci_libraries = array( - 'Calendar', 'Cart', 'Driver', + 'Calendar', 'Cart', 'Driver_Library', 'Email', 'Encrypt', 'Form_validation', 'Ftp', 'Image_lib', 'Javascript', 'Log', 'Migration', 'Pagination', @@ -50,7 +50,7 @@ function autoload($class) elseif (in_array($subclass, $ci_libraries)) { $dir = BASEPATH.'libraries'.DIRECTORY_SEPARATOR; - $class = $subclass; + $class = ($subclass == 'Driver_Library') ? 'Driver' : $subclass; } elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) == 3) { |