diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
| commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
| tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/libraries/Driver.php | |
| parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
| parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) | |
Merge branch 'working'
Diffstat (limited to 'system/libraries/Driver.php')
| -rwxr-xr-x | system/libraries/Driver.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/libraries/Driver.php b/system/libraries/Driver.php index d1838f2c1..c32f2c1eb 100755 --- a/system/libraries/Driver.php +++ b/system/libraries/Driver.php @@ -43,11 +43,11 @@ class CI_Driver_Library { // The class will be prefixed with the parent lib $child_class = $this->lib_name.'_'.$child; - + // Remove the CI_ prefix and lowercase - $lib_name = strtolower(preg_replace('/^CI_/', '', $this->lib_name)); - $driver_name = strtolower(preg_replace('/^CI_/', '', $child_class)); - + $lib_name = ucfirst(strtolower(str_replace('CI_', '', $this->lib_name))); + $driver_name = strtolower(str_replace('CI_', '', $child_class)); + if (in_array($driver_name, array_map('strtolower', $this->valid_drivers))) { // check and see if the driver is in a separate file @@ -59,7 +59,7 @@ class CI_Driver_Library { // loves me some nesting! foreach (array(ucfirst($driver_name), $driver_name) as $class) { - $filepath = $path.'libraries/'.$lib_name.'/drivers/'.$class.EXT; + $filepath = $path.'libraries/'.$lib_name.'/drivers/'.$class.'.php'; if (file_exists($filepath)) { @@ -226,4 +226,4 @@ class CI_Driver { // END CI_Driver CLASS /* End of file Driver.php */ -/* Location: ./system/libraries/Driver.php */
\ No newline at end of file +/* Location: ./system/libraries/Driver.php */ |