summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2010-12-27 18:41:02 +0100
committerPhil Sturgeon <email@philsturgeon.co.uk>2010-12-27 18:41:02 +0100
commitde3dbc36dab42d86c66d76efd6fdb1d1dce71ce8 (patch)
tree622cc7ac80820ffc059c03a2f3572d12e3ab60ac /system/core/Loader.php
parent6c597f8d4b1b1bc12ccb4ad298053f03e6def36c (diff)
Languages can now be placed in packages folders, and added ->load->get_package_paths().
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php35
1 files changed, 21 insertions, 14 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index afbae6175..136cae9bf 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -81,12 +81,12 @@ class CI_Loader {
{
foreach($library as $read)
{
- $this->library($read);
+ $this->library($read);
}
-
+
return;
}
-
+
if ($library == '' OR isset($this->_base_classes[$library]))
{
return FALSE;
@@ -527,7 +527,7 @@ class CI_Loader {
function add_package_path($path)
{
$path = rtrim($path, '/').'/';
-
+
array_unshift($this->_ci_library_paths, $path);
array_unshift($this->_ci_model_paths, $path);
array_unshift($this->_ci_helper_paths, $path);
@@ -540,6 +540,22 @@ class CI_Loader {
// --------------------------------------------------------------------
/**
+ * Get Package Paths
+ *
+ * Return a list of all package paths, by default it will ignore BASEPATH.
+ *
+ * @access public
+ * @param string
+ * @return void
+ */
+ function get_package_paths($include_base = FALSE)
+ {
+ return $include_base === TRUE ? $this->_ci_library_paths : $this->_ci_model_paths;
+ }
+
+ // --------------------------------------------------------------------
+
+ /**
* Remove Package Path
*
* Remove a path from the library, model, and helper path arrays if it exists
@@ -563,7 +579,7 @@ class CI_Loader {
else
{
$path = rtrim($path, '/').'/';
-
+
foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
{
if (($key = array_search($path, $this->{$var})) !== FALSE)
@@ -942,15 +958,6 @@ class CI_Loader {
return FALSE;
}
- // Autoload packages
- if (isset($autoload['packages']))
- {
- foreach ($autoload['packages'] as $package_path)
- {
- $this->add_package_path($package_path);
- }
- }
-
// Load any custom config file
if (count($autoload['config']) > 0)
{