diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-11 16:04:06 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2017-01-11 16:05:14 +0100 |
| commit | 99d05f0aaffa1750b74b1be4d3654bec95323517 (patch) | |
| tree | 16cd1c209d4664c7e1126a0b1ffdd3622846c300 /system | |
| parent | 1fb6958272b569c9f111f04375b90662726a92b8 (diff) | |
[ci skip] Merge pull request #4977 from fabiospampinato/fabiospampinato-loader-helper-regex-fix
Fixed regex used for loading helpers
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Loader.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index acfc739dd..5ed6adb48 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -590,7 +590,7 @@ class CI_Loader { { $filename = basename($helper); $filepath = ($filename === $helper) ? '' : substr($helper, 0, strlen($helper) - strlen($filename)); - $filename = strtolower(preg_replace('#(_helper)?(.php)?$#i', '', $filename)).'_helper'; + $filename = strtolower(preg_replace('#(_helper)?(\.php)?$#i', '', $filename)).'_helper'; $helper = $filepath.$filename; if (isset($this->_ci_helpers[$helper])) |