diff options
| author | Andrey Andreev <narf@devilix.net> | 2017-01-10 11:11:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 11:11:05 +0100 |
| commit | 0bbfff9f7ddc8a3994f5ed2ba320b4bbdd2205b9 (patch) | |
| tree | e097d6bb1fcf0a080fc3f15e8ab27980d2395084 /system | |
| parent | 7657600403b63d7656dce7b18d2880d3703ad57e (diff) | |
| parent | b9ac1a1c268dd6590bb8fb283f45326ce3e0c919 (diff) | |
Merge pull request #4975 from cfaulkner/fix_ci_prepare_view_vars
Fix an Undefined variable: object error in CI_Loader
Diffstat (limited to 'system')
| -rw-r--r-- | system/core/Loader.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 17ff2362c..acfc739dd 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -1368,7 +1368,7 @@ class CI_Loader { * Prepare variables for _ci_vars, to be later extract()-ed inside views * * Converts objects to associative arrays and filters-out internal - * variable names (i.e. keys prexied with '_ci_'). + * variable names (i.e. keys prefixed with '_ci_'). * * @param mixed $vars * @return array @@ -1378,7 +1378,7 @@ class CI_Loader { if ( ! is_array($vars)) { $vars = is_object($vars) - ? get_object_vars($object) + ? get_object_vars($vars) : array(); } |