Skip to content

Commit 401fabb

Browse files
committed
🔧 set [COREPATH, ROOTPATH] for config paths and APPROOT.'Views/' for view paths
Signed-off-by: otengkwame <[email protected]>
1 parent e4ab89f commit 401fabb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CodeIgniter/Framework/core/Hooks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public function action($action, $params = [])
216216
return $first['priority'] < $second['priority'];
217217
});
218218

219-
// Add params set in do_action to each hook
219+
// Add params set in calling function to each hook
220220
foreach ($this->hooks[$action] as $key => $hook) {
221221
$this->hooks[$action][$key]['params'] = $params;
222222
}

CodeIgniter/Framework/core/Loader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -859,8 +859,8 @@ public function remove_package_path($path = '')
859859
$this->_ci_library_paths = array_unique(array_merge($this->_ci_library_paths, [APPPATH, BASEPATH, THIRDPARTYPATH]));
860860
$this->_ci_helper_paths = array_unique(array_merge($this->_ci_helper_paths, [APPPATH, BASEPATH, THIRDPARTYPATH]));
861861
$this->_ci_model_paths = array_unique(array_merge($this->_ci_model_paths, [APPPATH, THIRDPARTYPATH]));
862-
$this->_ci_view_paths = array_merge($this->_ci_view_paths, [APPPATH.'views/' => true]);
863-
$config->_config_paths = array_unique(array_merge($config->_config_paths, [APPPATH]));
862+
$this->_ci_view_paths = array_merge($this->_ci_view_paths, [APPROOT.'Views/' => true]);
863+
$config->_config_paths = array_unique(array_merge($config->_config_paths, [COREPATH, ROOTPATH]));
864864

865865
return $this;
866866
}

0 commit comments

Comments
 (0)