summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-01-11 16:04:06 +0100
committerGitHub <noreply@github.com>2017-01-11 16:04:06 +0100
commit36dbe9c200bc3d4b227c6c2f3d670d90c150349d (patch)
tree8e9a0801247b4c80bb6ef29f2dc01df5867b054c /system/core/Loader.php
parent27647c9a8b5cd5a0e1fd78123316f359fe61a672 (diff)
parente82d91b0b322b4770441d00480d908be959ac175 (diff)
[ci skip] Merge pull request #4977 from fabiospampinato/fabiospampinato-loader-helper-regex-fix
Fixed regex used for loading helpers
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index e9813a7c9..7279e8833 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]))